diff options
| author | Filipe Manana <fdmanana@suse.com> | 2021-07-29 15:28:34 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-08-23 13:19:10 +0200 |
| commit | 1c167b87f4f9c89e33dcffb92a45e30f937f04d6 (patch) | |
| tree | d72b04141ceae448bfb984d7d23759178838291a /fs/btrfs | |
| parent | dce2815039061116c41da1db24b9282e6e5e1734 (diff) | |
| download | linux-1c167b87f4f9c89e33dcffb92a45e30f937f04d6.tar.bz2 | |
btrfs: remove unnecessary NULL check for the new inode during rename exchange
At the very end of btrfs_rename_exchange(), in case an error happened, we
are checking if 'new_inode' is NULL, but that is not needed since during a
rename exchange, unlike regular renames, 'new_inode' can never be NULL,
and if it were, we would have a crashed much earlier when we dereference it
multiple times.
So remove the check because it is not necessary and because it is causing
static checkers to emit a warning. I probably introduced the check by
copy-pasting similar code from btrfs_rename(), where 'new_inode' can be
NULL, in commit 86e8aa0e772cab ("Btrfs: unpin logs if rename exchange
operation fails").
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index bc41d6c8d8d8..d8a1e58b4bc8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9523,8 +9523,7 @@ out_fail: if (btrfs_inode_in_log(BTRFS_I(old_dir), fs_info->generation) || btrfs_inode_in_log(BTRFS_I(new_dir), fs_info->generation) || btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || - (new_inode && - btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) + btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation)) btrfs_set_log_full_commit(trans); if (root_log_pinned) { |