summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-17 14:56:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-17 14:56:22 -0700
commit099d44e869f1886b5eb02a5145ca97b5e4142e28 (patch)
tree30db794ad875e8c919db0b05cb9e844202bda395
parent4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 (diff)
parent481d0374217f3fefaf98efbd8d21d73c138dd928 (diff)
downloadop-kernel-dev-099d44e869f1886b5eb02a5145ca97b5e4142e28.zip
op-kernel-dev-099d44e869f1886b5eb02a5145ca97b5e4142e28.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
-rw-r--r--fs/ntfs/ChangeLog2
-rw-r--r--fs/ntfs/aops.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 21e21fe..9eecc99 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 3f43bfe6..78adad7 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;
OpenPOWER on IntegriCloud