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 2/5] btrfs: remove set but not used variable err in btrfs_add_link
Date: Mon, 19 Nov 2018 10:38:14 +0100 [thread overview]
Message-ID: <20181119093817.9291-3-jthumshirn@suse.de> (raw)
In-Reply-To: <20181119093817.9291-1-jthumshirn@suse.de>
err holds the return value of either btrfs_del_root_ref() or
btrfs_del_inode_ref() but it hasn't been checked since it's introduction with
commit fe66a05a0679 (Btrfs: improve error handling for btrfs_insert_dir_item
callers) in 2012.
As the error value hasn't been of any interest for 6 years we can just drop it
as well.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/inode.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 9becf8543489..7f56a235c0b1 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6395,17 +6395,16 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
fail_dir_item:
if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {
u64 local_index;
- int err;
- err = btrfs_del_root_ref(trans, key.objectid,
- root->root_key.objectid, parent_ino,
- &local_index, name, name_len);
+
+ btrfs_del_root_ref(trans, key.objectid,
+ root->root_key.objectid, parent_ino,
+ &local_index, name, name_len);
} else if (add_backref) {
u64 local_index;
- int err;
- err = btrfs_del_inode_ref(trans, root, name, name_len,
- ino, parent_ino, &local_index);
+ btrfs_del_inode_ref(trans, root, name, name_len,
+ ino, parent_ino, &local_index);
}
return ret;
}
--
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 ` [PATCH v2 1/5] btrfs: remove unused drop_on_err in btrfs_mkdir() Johannes Thumshirn
2018-11-19 9:38 ` Johannes Thumshirn [this message]
2018-11-19 14:13 ` [PATCH v2 2/5] btrfs: remove set but not used variable err in btrfs_add_link 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-3-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).