Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
fs/ntfs/ChangeLog
+ 1
− 1
View file @ 099d44e8
...@@ -175,7 +175,7 @@ ToDo/Notes: ...@@ -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.
......
fs/ntfs/aops.c
+ 1
− 0
View file @ 099d44e8
...@@ -924,6 +924,7 @@ static int ntfs_write_mst_block(struct page *page, ...@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment