openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linus Torvalds 2005-08-17 14:56:22 -07:00
parent 4e6a06eec4 481d037421
commit 099d44e869
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ntfs/ChangeLog
View File

@ -175,7 +175,7 @@ ToDo/Notes:
the ntfs inode in memory if present. Also, the ntfs inode has its 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. 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 - 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. Thanks to Martin MOKREJŠ for the bug report.
2.1.22 - Many bug and race fixes and error handling improvements. 2.1.22 - Many bug and race fixes and error handling improvements.

1
fs/ntfs/aops.c
View File

@ -924,6 +924,7 @@ static int ntfs_write_mst_block(struct page *page,
LCN lcn; LCN lcn;
unsigned int vcn_ofs; unsigned int vcn_ofs;
bh->b_bdev = vol->sb->s_bdev;
/* Obtain the vcn and offset of the current block. */ /* Obtain the vcn and offset of the current block. */
vcn = (VCN)block << bh_size_bits; vcn = (VCN)block << bh_size_bits;
vcn_ofs = vcn & vol->cluster_size_mask; vcn_ofs = vcn & vol->cluster_size_mask;