diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-16 09:31:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-16 09:31:28 -0700 |
| commit | cf59001235c5a36f3e3701bd593a78cf955a4242 (patch) | |
| tree | 8bd67575a8f3640f29dec67a424b7488582b8cd8 | |
| parent | 65e4308d2500e7daf60c3dccc202c61ffb066c63 (diff) | |
| parent | e74589ac250e463973361774a90fee2c9d71da02 (diff) | |
| download | kernel_samsung_smdk4412-cf59001235c5a36f3e3701bd593a78cf955a4242.tar.gz kernel_samsung_smdk4412-cf59001235c5a36f3e3701bd593a78cf955a4242.tar.bz2 kernel_samsung_smdk4412-cf59001235c5a36f3e3701bd593a78cf955a4242.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
| -rw-r--r-- | fs/ntfs/ChangeLog | 3 | ||||
| -rw-r--r-- | fs/ntfs/mft.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index 9709fac6531..21e21fe519e 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog @@ -174,6 +174,9 @@ ToDo/Notes: fact that the vfs and ntfs inodes are one struct in memory to find 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 + 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/mft.c b/fs/ntfs/mft.c index ac9ff39aa83..317f7c679fd 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -533,6 +533,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no, LCN lcn; unsigned int vcn_ofs; + bh->b_bdev = vol->sb->s_bdev; /* Obtain the vcn and offset of the current block. */ vcn = ((VCN)mft_no << vol->mft_record_size_bits) + (block_start - m_start); @@ -725,6 +726,7 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync) LCN lcn; unsigned int vcn_ofs; + bh->b_bdev = vol->sb->s_bdev; /* Obtain the vcn and offset of the current block. */ vcn = ((VCN)ni->mft_no << vol->mft_record_size_bits) + (block_start - m_start); |