| Message ID | 20200108125835.45768-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] btrfs: remove set but not used variable 'root_objectid' | expand |
On Wed, Jan 08, 2020 at 08:58:35PM +0800, YueHaibing wrote: > fs/btrfs/inode.c: In function btrfs_rename: > fs/btrfs/inode.c:9196:6: warning: variable root_objectid set but not used [-Wunused-but-set-variable] > > commit f8b3030e0807 ("btrfs: rework arguments of btrfs_unlink_subvol") > left behind this unused variable. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Thanks, I'll fold it to the patch.
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 493c0fe..990f509 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9204,7 +9204,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_inode = d_inode(new_dentry); struct inode *old_inode = d_inode(old_dentry); u64 index = 0; - u64 root_objectid; int ret; u64 old_ino = btrfs_ino(BTRFS_I(old_inode)); bool log_pinned = false; @@ -9331,7 +9330,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, new_inode->i_ctime = current_time(new_inode); if (unlikely(btrfs_ino(BTRFS_I(new_inode)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)) { - root_objectid = BTRFS_I(new_inode)->location.objectid; ret = btrfs_unlink_subvol(trans, new_dir, new_dentry); BUG_ON(new_inode->i_nlink == 0); } else {
fs/btrfs/inode.c: In function btrfs_rename: fs/btrfs/inode.c:9196:6: warning: variable root_objectid set but not used [-Wunused-but-set-variable] commit f8b3030e0807 ("btrfs: rework arguments of btrfs_unlink_subvol") left behind this unused variable. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- fs/btrfs/inode.c | 2 -- 1 file changed, 2 deletions(-)