From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH v2 1/5] btrfs: remove unused drop_on_err in btrfs_mkdir()
Date: Mon, 19 Nov 2018 10:38:13 +0100 [thread overview]
Message-ID: <20181119093817.9291-2-jthumshirn@suse.de> (raw)
In-Reply-To: <20181119093817.9291-1-jthumshirn@suse.de>
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>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/inode.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2585200cb43a..9becf8543489 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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);
--
2.16.4
next prev parent reply other threads:[~2018-11-19 9:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 9:38 [PATCH v2 0/5] btrfs: fix compiler warning with make W=1 Johannes Thumshirn
2018-11-19 9:38 ` Johannes Thumshirn [this message]
2018-11-19 9:38 ` [PATCH v2 2/5] btrfs: remove set but not used variable err in btrfs_add_link Johannes Thumshirn
2018-11-19 14:13 ` David Sterba
2018-11-19 9:38 ` [PATCH v2 3/5] btrfs: remove unused function btrfs_sysfs_feature_update() Johannes Thumshirn
2018-11-19 14:21 ` David Sterba
2018-11-19 9:38 ` [PATCH v2 4/5] btrfs: introduce EXPORT_FOR_TESTS macro Johannes Thumshirn
2018-11-19 9:49 ` Nikolay Borisov
2018-11-19 9:38 ` [PATCH v2 5/5] btrfs: use EXPORT_FOR_TESTS for conditionally shared functions Johannes Thumshirn
2018-11-19 9:50 ` Nikolay Borisov
2018-11-19 14:40 ` [PATCH v2 0/5] btrfs: fix compiler warning with make W=1 David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181119093817.9291-2-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).