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

2 files changed, 2 insertions, 1 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 21e21fe519e2..9eecc9939dfe 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -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.
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 3f43bfe6184e..78adad7a988d 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -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;