| Message ID | 20181114133520.16069-2-jthumshirn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: fix compiler warning with make W=1 | expand |
On Wed, Nov 14, 2018 at 02:35:15PM +0100, Johannes Thumshirn wrote: > Up to commit 32955c5422a8 (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 32955c5422a8 (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> > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > --- > fs/btrfs/inode.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 4a2f9f7fd96e..7d17b0a654e6 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -6677,7 +6677,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; > > @@ -6703,7 +6702,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; > @@ -6724,7 +6722,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); > -- > 2.16.4 >
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4a2f9f7fd96e..7d17b0a654e6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6677,7 +6677,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; @@ -6703,7 +6702,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; @@ -6724,7 +6722,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);
Up to commit 32955c5422a8 (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 32955c5422a8 (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. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- fs/btrfs/inode.c | 3 --- 1 file changed, 3 deletions(-)