summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-08 16:18:51 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-08 14:50:47 -0500
commit8c36e9dfe7527665e286c3ac970c3fb327e6ab24 (patch)
tree8b54ea4dab5ef7006ff9d785b8b150497162cd5e /fs/cifs/cifsfs.c
parentffa0160a103917defd5d9c097ae0455a59166e03 (diff)
downloadlinux-8c36e9dfe7527665e286c3ac970c3fb327e6ab24.tar.bz2
cifs: avoid unused variable and label
The newly introduced cifs_clone_file_range() function produces two harmless compile-time warnings: cifsfs.c: In function 'cifs_clone_file_range': cifsfs.c:963:1: warning: label 'out_unlock' defined but not used [-Wunused-label] cifsfs.c:924:20: warning: unused variable 'src_tcon' [-Wunused-variable] In both cases, removing the extraneous line avoids the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: c6f2a1e2e5f8 ("vfs: pull btrfs clone API to vfs layer") Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r--fs/cifs/cifsfs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index e9b978f2e114..fd3643451dd5 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -921,7 +921,6 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,
struct inode *target_inode = file_inode(dst_file);
struct cifsFileInfo *smb_file_src = src_file->private_data;
struct cifsFileInfo *smb_file_target = dst_file->private_data;
- struct cifs_tcon *src_tcon = tlink_tcon(smb_file_src->tlink);
struct cifs_tcon *target_tcon = tlink_tcon(smb_file_target->tlink);
unsigned int xid;
int rc;
@@ -960,7 +959,6 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,
/* force revalidate of size and timestamps of target file now
that target is updated on the server */
CIFS_I(target_inode)->time = 0;
-out_unlock:
/* although unlocking in the reverse order from locking is not
strictly necessary here it is a little cleaner to be consistent */
unlock_two_nondirectories(src_inode, target_inode);