From patchwork Mon Feb 1 16:23:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8181181 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE5A99F38B for ; Mon, 1 Feb 2016 16:24:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7729D2027D for ; Mon, 1 Feb 2016 16:24:57 +0000 (UTC) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B324F20266 for ; Mon, 1 Feb 2016 16:24:52 +0000 (UTC) Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u11GOTE6028888 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Feb 2016 16:24:30 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u11GORVr015524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 1 Feb 2016 16:24:27 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1aQHH9-0000Zc-DJ; Mon, 01 Feb 2016 08:24:27 -0800 Received: from aserv0021.oracle.com ([141.146.126.233]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1aQHGj-0000YN-99 for ocfs2-devel@oss.oracle.com; Mon, 01 Feb 2016 08:24:01 -0800 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u11GO1lS006336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Feb 2016 16:24:01 GMT Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u11GO0wO006501 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 1 Feb 2016 16:24:00 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.15.0.59/8.15.0.59) with SMTP id u11GLDpF040120 for ; Mon, 1 Feb 2016 16:24:00 GMT Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) by userp2040.oracle.com with ESMTP id 20rkst0660-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 01 Feb 2016 16:23:59 +0000 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MSUvb-1aWAAm2ALz-00TXVQ; Mon, 01 Feb 2016 17:23:43 +0100 From: Arnd Bergmann To: Andrew Morton Date: Mon, 01 Feb 2016 17:23:39 +0100 Message-ID: <3477441.9K8aQAEjZq@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:Kml0DR9QGCXCVVu54Esnw7EMmB6BDhH0kVlNG6V9Pp1Tnd2/uPz 1op34Oer75h6CXAPYERb4dJxAuQ11MjIjpluMhJz/EBmh6ASS6eDuExpxAOVZ+SQVFt4OQV GQcxlsLTt8fm9AQCRTQ5sR9ZJL9FnappPllAYzHFATT98KyvzLuR5Z7CPBNMz0ccneY74Rz p6hsaVE03JM+3uICrrTwQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:hqDOzapT+2c=:rD/qr9ef5/of+Ty3B7QfRr Q1L5Xn8bsY0nR72sb4N8vjjuIibAkCHWy1cBb+v6jgFclJwu7KHNq9ro5p6PWluD4r7l+AHLA qiIxWfCUJuLk5Lbn0YHq9OSCUVfAkjCgkZ349JfZsdENgGGbAt3W5RbnHTmeaO/+WZvNjZ70b PMAtXqCPHgZnFurxMNRu6J0K6xjGhPjdEGmxE8WZrm3B1xxlR6Kttx2My6BnqCGBTVghSj0MA 4Au2GLOeuSKNey6zI4eTHtd28vI89j4ZmRuAATNjIX2LKzqvvtIIxxJtB8MFp0uLdXnuOCvqR pFiFFA9hyKJduNEYmnKHC4RIl9WyScRlqvkvVVhS2F6ni76uu/o16xaiGTg/w/dJPoLwrUsGw PwQ28HPr87AsxDWlC+p7cH3olOYWFpTluzdH/w5iY/hI3G657pYkeYYsMl40FWrhfN0058fiY UrXSCjrx098aNfCN5JPbFPUcKXRR8atYvnskH7HeP9CR2/CQszeJfLQVZIDkgzISgccDrS3yJ N+drQDtmqK+u16aHuHVEd09PbPQvVUkbXW9mUoiEIxfyJskFVHKD5B7c9aF4taO/X17Myere5 mBrRBvh1ed+7tgwbvodbpfXPGTjR48FqdTHT++pd54YSzMEide2dfUVU71LSYBvo6c/qryVra WpdLlNRaCfHrbIy2BEZqMUJD7e2Ap9WgWp85fFtC5fpdK1egUE8esH5aOmtEMlQtUKEly0Uc5 ER7ImZAa7e+T2y1m X-Proofpoint-SPF-Result: None X-ServerName: mout.kundenserver.de X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8062 signatures=670686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1601100000 definitions=main-1602010268 Cc: linux-arm-kernel@lists.infradead.org, Mark Fasheh , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH] ocfs2: remove unused label X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0022.oracle.com [141.146.126.234] X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A recent cleanup modified the ocfs2_file_write_iter function, which no longer uses its 'relock' label, as gcc warns: fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': fs/ocfs2/file.c:2198:1: error: label 'relock' defined but not used [-Werror=unused-label] This removes the label as well. Signed-off-by: Arnd Bergmann Fixes: 1a46f12e5071 ("ocfs2: code clean up for direct io") --- Found on ARM randconfig builds on linux-next last week. diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 41c506e7814e..c18ab45f8d21 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2195,7 +2195,6 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, inode_lock(inode); -relock: /* * Concurrent O_DIRECT writes are allowed with * mount_option "coherency=buffered".