aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Gouriou <egouriou@google.com>2011-05-22 21:33:00 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-05-22 21:33:00 -0400
commitf6d2f6b327ceef5c689581529a852dc6ec3b74a6 (patch)
tree9ae24dbb3787f596687954322c55e73570d6ed88
parent77f4135f2a219a2127be6cc1208c42e6175b11dd (diff)
ext4: fix unbalanced up_write() in ext4_ext_truncate() error path
ext4_ext_truncate() should not invoke up_write(&EXT4_I(inode)->i_data_sem) when ext4_orphan_add() returns an error, as it hasn't performed a down_write() yet. This trivial patch fixes this by moving the up_write() invocation above the out_stop label. Signed-off-by: Eric Gouriou <egouriou@google.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/extents.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 4444317d141a..4e2bdc26b85c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3450,8 +3450,9 @@ void ext4_ext_truncate(struct inode *inode)
3450 if (IS_SYNC(inode)) 3450 if (IS_SYNC(inode))
3451 ext4_handle_sync(handle); 3451 ext4_handle_sync(handle);
3452 3452
3453out_stop:
3454 up_write(&EXT4_I(inode)->i_data_sem); 3453 up_write(&EXT4_I(inode)->i_data_sem);
3454
3455out_stop:
3455 /* 3456 /*
3456 * If this was a simple ftruncate() and the file will remain alive, 3457 * If this was a simple ftruncate() and the file will remain alive,
3457 * then we need to clear up the orphan record which we created above. 3458 * then we need to clear up the orphan record which we created above.