summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Moore <dmoorefo@gmail.com>2015-06-08 11:59:12 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-06-08 11:59:12 -0400
commit8bc3b1e6e8fdc1c605c06c027d999b5cca434779 (patch)
treeab1264984cee212500e06bf65930f7f61ee7bbf2
parentad0a0ce894d554b112afab6a48fd500e636686a6 (diff)
downloadop-kernel-dev-8bc3b1e6e8fdc1c605c06c027d999b5cca434779.zip
op-kernel-dev-8bc3b1e6e8fdc1c605c06c027d999b5cca434779.tar.gz
ext4: BUG_ON assertion repeated for inode1, not done for inode2
During a source code review of fs/ext4/extents.c I noted identical consecutive lines. An assertion is repeated for inode1 and never done for inode2. This is not in keeping with the rest of the code in the ext4_swap_extents function and appears to be a bug. Assert that the inode2 mutex is not locked. Signed-off-by: David Moore <dmoorefo@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
-rw-r--r--fs/ext4/extents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e003a1e..f38a6d6 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5542,7 +5542,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
BUG_ON(!rwsem_is_locked(&EXT4_I(inode1)->i_data_sem));
BUG_ON(!rwsem_is_locked(&EXT4_I(inode2)->i_data_sem));
BUG_ON(!mutex_is_locked(&inode1->i_mutex));
- BUG_ON(!mutex_is_locked(&inode1->i_mutex));
+ BUG_ON(!mutex_is_locked(&inode2->i_mutex));
*erp = ext4_es_remove_extent(inode1, lblk1, count);
if (unlikely(*erp))
OpenPOWER on IntegriCloud