From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965192AbbLHPTX (ORCPT ); Tue, 8 Dec 2015 10:19:23 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:52455 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964955AbbLHPTU (ORCPT ); Tue, 8 Dec 2015 10:19:20 -0500 From: Arnd Bergmann To: linux-cifs@vger.kernel.org Cc: Steve French , samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Al Viro , linux-arm-kernel@lists.infradead.org Subject: [PATCH] cifs: avoid unused variable and label Date: Tue, 08 Dec 2015 16:18:51 +0100 Message-ID: <1626899.G9TJfXXyu0@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:36HwDWRaWVoa2Vl5W8flAg7omhlZdwknrRpUKxwUPu5dunQ0Cbf FKf44J2QgNgBLqVxRG3UE6NvDNb3DAYgs2kCBOAAVJqQH0o8OLVOSv256XQ0M33IXuzPC7P cH/8I0xBazlMr8d+g4wO0BWOZzrFPq2PcuejsXk+h79QY/XzsDKqbWX9PyuUy+GwkKsP6Oi bk2Pe+gD/1FfzNXczzQaw== X-UI-Out-Filterresults: notjunk:1;V01:K0:13TUoKS48tk=:qHqMvognMwnJrFMGPVMn94 JttGqG3Nnu/QuoNUcMsWX/o1tYo1lxykBponodEHn37HuNLYrxTMoDZDbpxgygmBOzsdUsx4O 29E5+dNsxT0BkgJB13FaV7szwF5SRWXw2bhFb0lLTy/66qipTD3h7Mu4PwRPP7dqPIbOpaf+W TIzsm+jNjH2pUPiZbUTUq+FSUORFK1S1RUKpL14WaaKpxS4B5KzV0+UiS5xo3pCb/oPiqbGbt jYUeuFoewUmgkQ3XyMIC6giC1kx+o4re8mSGsL5TTQukIpOe5jsBlddA4pSGARNRFHbTVn+ta cwL5sVSNGYbM9Brht1qZaBFsfRE9rgVWw1YczNKopLyitXxt4M4cf864KfED1AIXvnXWbVVWD TH5fxAC8kTWtOmiiOy8bA5X5rSR4YY3suFzpgooXo9roVdF2U/zKCZy1WreavqODPUvWOjbMs QmtRFBw5TCzHxbyF4DSuznssXIPQYu7il1T0dzNdowohTzDYCf9st1nPHCTu3VBHBb/7jA9iw 8bdVRrKN4phARcO9smr4npSCb/PEGmuKU44sBNvhMebL+dXogNUQQJEGGIuvi9U+N7iQY2A6R pj1pAE3Yjid/jbnVKWM4W3ZyfWPtq6or/vJsV05YgleX2+3DxAPskYxvgwdg/4Vtn21ePpE6W 5Z2Qd6SjB5NAN69F6R0REOeXCEeNF8cE4iI5AYsP/yLFNqaeGdC2mB4U1R/XA+x9YhP21w690 T8QBYiXoMeQ4edEz Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: c6f2a1e2e5f8 ("vfs: pull btrfs clone API to vfs layer") --- fs/cifs/cifsfs.c | 2 -- 1 file changed, 2 deletions(-) Found on ARM allmodconfig builds. diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 5cc7f5390a2a..b4d1cca853fc 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); -- 2.1.0.rc2