From 50560c6016ca0e750170a5a582961177abbc00a0 Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Thu, 13 Jan 2005 11:04:39 +0000 Subject: [PATCH] --- yaml --- r: 4840 b: refs/heads/master c: 3834c3f227725e2395840aed82342bda4ee9d379 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ntfs/mft.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3cf7ca3ad5d5..d0096d220ee7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 149f0c5200188a43f1fc11ca2fb14d8183013d10 +refs/heads/master: 3834c3f227725e2395840aed82342bda4ee9d379 diff --git a/trunk/fs/ntfs/mft.c b/trunk/fs/ntfs/mft.c index 20011e02f5b6..4e0bf39426cf 100644 --- a/trunk/fs/ntfs/mft.c +++ b/trunk/fs/ntfs/mft.c @@ -2377,22 +2377,20 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_volume *vol, const int mode, * first written to so it optimizes away nicely in the common case. */ read_lock_irqsave(&mft_ni->size_lock, flags); - old_data_size = mft_ni->allocated_size; ntfs_debug("Status of mft data before extension: " "allocated_size 0x%llx, data_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)mft_ni->initialized_size); - read_unlock_irqrestore(&mft_ni->size_lock, flags); - while (ll > old_data_size) { + while (ll > mft_ni->allocated_size) { + read_unlock_irqrestore(&mft_ni->size_lock, flags); err = ntfs_mft_data_extend_allocation_nolock(vol); if (unlikely(err)) { ntfs_error(vol->sb, "Failed to extend mft data " "allocation."); goto undo_mftbmp_alloc_nolock; } -#ifdef DEBUG read_lock_irqsave(&mft_ni->size_lock, flags); ntfs_debug("Status of mft data after allocation extension: " "allocated_size 0x%llx, data_size 0x%llx, " @@ -2400,9 +2398,8 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_volume *vol, const int mode, (long long)mft_ni->allocated_size, (long long)i_size_read(vol->mft_ino), (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 * the allocated mft record, formatting the mft records allong the way.