tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 099d44e8 4e6a06ee

+2 -1
unified split
+1 -1
fs/ntfs/ChangeLog
··· 175 the ntfs inode in memory if present. Also, the ntfs inode has its 176 own locking so it does not matter if the vfs inode is locked. 177 - Fix bug in mft record writing where we forgot to set the device in 178 - the buffers when mapping them after the VM had discarded them 179 Thanks to Martin MOKREJŠ for the bug report. 180 181 2.1.22 - Many bug and race fixes and error handling improvements.
··· 175 the ntfs inode in memory if present. Also, the ntfs inode has its 176 own locking so it does not matter if the vfs inode is locked. 177 - Fix bug in mft record writing where we forgot to set the device in 178 + the buffers when mapping them after the VM had discarded them. 179 Thanks to Martin MOKREJŠ for the bug report. 180 181 2.1.22 - Many bug and race fixes and error handling improvements.
+1
fs/ntfs/aops.c
··· 924 LCN lcn; 925 unsigned int vcn_ofs; 926 927 /* Obtain the vcn and offset of the current block. */ 928 vcn = (VCN)block << bh_size_bits; 929 vcn_ofs = vcn & vol->cluster_size_mask;
··· 924 LCN lcn; 925 unsigned int vcn_ofs; 926 927 + bh->b_bdev = vol->sb->s_bdev; 928 /* Obtain the vcn and offset of the current block. */ 929 vcn = (VCN)block << bh_size_bits; 930 vcn_ofs = vcn & vol->cluster_size_mask;