Merge tag 'configfs-for-linus' of git://git.infradead.org/users/hch/configfs

[karo-tx-linux.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index e9b978f2e11481b0a8f2a98154d3f39d9c2ec53d..b7fcb3151103cefcc02ecaaf042b59e2b2ff9454 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -900,8 +900,7 @@ const struct inode_operations cifs_file_inode_ops = {
 
 const struct inode_operations cifs_symlink_inode_ops = {
        .readlink = generic_readlink,
-       .follow_link = cifs_follow_link,
-       .put_link = kfree_put_link,
+       .get_link = cifs_get_link,
        .permission = cifs_permission,
        /* BB add the following two eventually */
        /* revalidate: cifs_revalidate,
@@ -921,7 +920,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 +958,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);