Эх сурвалжийг харах

NTFS: Complete the previous fix for the unset device when mapping buffers
for mft record writing. I had missed the writepage based mft record
write code path.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Anton Altaparmakov 20 жил өмнө
parent
commit
481d037421

+ 1 - 1
fs/ntfs/ChangeLog

@@ -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 - 0
fs/ntfs/aops.c

@@ -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;