| Message ID | 1305051177-18452-1-git-send-email-egouriou@google.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, May 10, 2011 at 11:12:57AM -0700, Eric Gouriou wrote: > 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> Thanks, applied to the ext4 tree! - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e363f21..ae3c9e6 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3443,8 +3443,9 @@ void ext4_ext_truncate(struct inode *inode) if (IS_SYNC(inode)) ext4_handle_sync(handle); -out_stop: up_write(&EXT4_I(inode)->i_data_sem); + +out_stop: /* * If this was a simple ftruncate() and the file will remain alive, * then we need to clear up the orphan record which we created above.
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> --- fs/ext4/extents.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)