Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099d44e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6

parents 4e6a06ee 481d0374

fs/ntfs/ChangeLog

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ ToDo/Notes: 
	  the ntfs inode in memory if present.  Also, the ntfs inode has its

	  own locking so it does not matter if the vfs inode is locked.

	- Fix bug in mft record writing where we forgot to set the device in

	  the buffers when mapping them after the VM had discarded them

	  the buffers when mapping them after the VM had discarded them.

	  Thanks to Martin MOKREJŠ for the bug report.



2.1.22 - Many bug and race fixes and error handling improvements.

fs/ntfs/aops.c

+1 −0
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ static int ntfs_write_mst_block(struct page *page, 
			LCN lcn;

			unsigned int vcn_ofs;



			bh->b_bdev = vol->sb->s_bdev;

			/* Obtain the vcn and offset of the current block. */

			vcn = (VCN)block << bh_size_bits;

			vcn_ofs = vcn & vol->cluster_size_mask;