Skip to content

L
linux-davinci
Commit 3834c3f2 authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files
Options

NTFS: Fix stupid bug in fs/ntfs/mft.c introduced in last changeset. 

Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 149f0c52
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
fs/ntfs/mft.c
View file @ 3834c3f2
...@@ -2377,22 +2377,20 @@ have_alloc_rec: ...@@ -2377,22 +2377,20 @@ have_alloc_rec:
* first written to so it optimizes away nicely in the common case. * first written to so it optimizes away nicely in the common case.
*/ */
read_lock_irqsave(&mft_ni->size_lock, flags); read_lock_irqsave(&mft_ni->size_lock, flags);
old_data_size = mft_ni->allocated_size;
ntfs_debug("Status of mft data before extension: " ntfs_debug("Status of mft data before extension: "
"allocated_size 0x%llx, data_size 0x%llx, " "allocated_size 0x%llx, data_size 0x%llx, "
"initialized_size 0x%llx.", "initialized_size 0x%llx.",
(long long)old_data_size, (long long)mft_ni->allocated_size,
(long long)i_size_read(vol->mft_ino), (long long)i_size_read(vol->mft_ino),
(long long)mft_ni->initialized_size); (long long)mft_ni->initialized_size);
read_unlock_irqrestore(&mft_ni->size_lock, flags); while (ll > mft_ni->allocated_size) {
while (ll > old_data_size) { read_unlock_irqrestore(&mft_ni->size_lock, flags);
err = ntfs_mft_data_extend_allocation_nolock(vol); err = ntfs_mft_data_extend_allocation_nolock(vol);
if (unlikely(err)) { if (unlikely(err)) {
ntfs_error(vol->sb, "Failed to extend mft data " ntfs_error(vol->sb, "Failed to extend mft data "
"allocation."); "allocation.");
goto undo_mftbmp_alloc_nolock; goto undo_mftbmp_alloc_nolock;
} }
#ifdef DEBUG
read_lock_irqsave(&mft_ni->size_lock, flags); read_lock_irqsave(&mft_ni->size_lock, flags);
ntfs_debug("Status of mft data after allocation extension: " ntfs_debug("Status of mft data after allocation extension: "
"allocated_size 0x%llx, data_size 0x%llx, " "allocated_size 0x%llx, data_size 0x%llx, "
...@@ -2400,9 +2398,8 @@ have_alloc_rec: ...@@ -2400,9 +2398,8 @@ have_alloc_rec:
(long long)mft_ni->allocated_size, (long long)mft_ni->allocated_size,
(long long)i_size_read(vol->mft_ino), (long long)i_size_read(vol->mft_ino),
(long long)mft_ni->initialized_size); (long long)mft_ni->initialized_size);
read_unlock_irqrestore(&mft_ni->size_lock, flags);
#endif /* DEBUG */
} }
read_unlock_irqrestore(&mft_ni->size_lock, flags);
/* /*
* Extend mft data initialized size (and data size of course) to reach * Extend mft data initialized size (and data size of course) to reach
* the allocated mft record, formatting the mft records allong the way. * the allocated mft record, formatting the mft records allong the way.
......
Markdown is supported
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