Commit e9a05cf3 authored Nov 19, 2018 by Johannes Thumshirn Committed by David Sterba Dec 17, 2018

btrfs: remove unused drop_on_err in btrfs_mkdir



Up to commit 32955c54 ("btrfs: switch to discard_new_inode()") the
drop_on_err variable in btrfs_mkdir() was used to check whether the
inode had to be dropped via iput().

After commit 32955c54 ("btrfs: switch to discard_new_inode()")
discard_new_inode() is called when err is set and inode is non NULL.
Therefore drop_on_err is not used anymore and thus causes a warning when
building with -Wunused-but-set-variable.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 9bfd61d9

fs/btrfs/inode.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -6645,7 +6645,6 @@ static int btrfs_mkdir(struct inode dir, struct dentry dentry, umode_t mode)
		struct btrfs_trans_handle *trans;
		struct btrfs_root *root = BTRFS_I(dir)->root;
		int err = 0;
		int drop_on_err = 0;
		u64 objectid = 0;
		u64 index = 0;

		@@ -6671,7 +6670,6 @@ static int btrfs_mkdir(struct inode dir, struct dentry dentry, umode_t mode)
		goto out_fail;
		}

		drop_on_err = 1;
		/* these must be set before we unlock the inode */
		inode->i_op = &btrfs_dir_inode_operations;
		inode->i_fop = &btrfs_dir_file_operations;
		@@ -6692,7 +6690,6 @@ static int btrfs_mkdir(struct inode dir, struct dentry dentry, umode_t mode)
		goto out_fail;

		d_instantiate_new(dentry, inode);
		drop_on_err = 0;

		out_fail:
		btrfs_end_transaction(trans);