Commit 8c36e9df authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Al Viro

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: c6f2a1e2e5f8 ("vfs: pull btrfs clone API to vfs layer")
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ffa0160a
...@@ -921,7 +921,6 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off, ...@@ -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 inode *target_inode = file_inode(dst_file);
struct cifsFileInfo *smb_file_src = src_file->private_data; struct cifsFileInfo *smb_file_src = src_file->private_data;
struct cifsFileInfo *smb_file_target = dst_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); struct cifs_tcon *target_tcon = tlink_tcon(smb_file_target->tlink);
unsigned int xid; unsigned int xid;
int rc; int rc;
...@@ -960,7 +959,6 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off, ...@@ -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 /* force revalidate of size and timestamps of target file now
that target is updated on the server */ that target is updated on the server */
CIFS_I(target_inode)->time = 0; CIFS_I(target_inode)->time = 0;
out_unlock:
/* although unlocking in the reverse order from locking is not /* although unlocking in the reverse order from locking is not
strictly necessary here it is a little cleaner to be consistent */ strictly necessary here it is a little cleaner to be consistent */
unlock_two_nondirectories(src_inode, target_inode); unlock_two_nondirectories(src_inode, target_inode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment