From patchwork Tue Jul 18 16:22:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 9848877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 63FBF600CC for ; Tue, 18 Jul 2017 16:23:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65D8426E4A for ; Tue, 18 Jul 2017 16:23:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A8AF2859E; Tue, 18 Jul 2017 16:23:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 03D1926E4A for ; Tue, 18 Jul 2017 16:23:21 +0000 (UTC) Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v6IGN2cn022695 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Jul 2017 16:23:02 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v6IGMvgD009854 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 Jul 2017 16:22:57 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 1dXVGz-0005d5-N5; Tue, 18 Jul 2017 09:22:57 -0700 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1dXVGc-0005cH-J5 for ocfs2-devel@oss.oracle.com; Tue, 18 Jul 2017 09:22:34 -0700 Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v6IGMYrf017279 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Tue, 18 Jul 2017 16:22:34 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.20/8.16.0.20) with SMTP id v6IGJrYK048086 for ; Tue, 18 Jul 2017 16:22:33 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=jack@suse.cz Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by userp2030.oracle.com with ESMTP id 2bshgd9dkp-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 18 Jul 2017 16:22:33 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 783B9AD43; Tue, 18 Jul 2017 16:22:30 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 8CEB81E340E; Tue, 18 Jul 2017 18:22:29 +0200 (CEST) From: Jan Kara To: Andrew Morton Date: Tue, 18 Jul 2017 18:22:19 +0200 Message-Id: <20170718162220.27526-1-jack@suse.cz> X-Mailer: git-send-email 2.12.3 X-CLX-Shades: MLX X-CLX-Response: 1TFkXGxIaEQpMehcZGhEKWU0XZ2ZyEQpZSRcacRoQGncGGxwacRkTEBp3Bhg aBhoRClleF2huZhEKSUYXRVhLSUZPdVpYRU5fSV5DRUQeEQpDThd/axxOXXNLUGRMeWZaHVBZTh pOS0UTGk5mGmZPHH0bUBEKWFwXHwQaBBsbGQcbSBJOG04aSAUbGgQbGhoEHhIEGxAbHhofGhEKX lkXe0UTWkERCk1cFxkYHhEKTFoXaGlNTXkRCkNaFxsTHwQbGR8EGBgaBBsfEQpCXhcbEQpESRcZ EQpCRhdlQUQcTU5DGBJ8QhEKQlwXGhEKQkUXYAFhe1tae0ABYm0RCkJOF2UaeBsFBXBze1NZEQp CTBdtZHhifE97YUNfXxEKQmwXaX4YfEBfSBxOa1IRCkJAF2ZaaGYFGGVhbl1OEQpCWBdifW95AU 8YGXBwexEKWlgXGxEKcGcXZ34dEh9MT0hLeXIQGRoRCnBoF2ITekQeexteRwVjEBkaEQpwaBdsR X57a3xcUB5GSRAZGhEKcGgXbllBSx8SBVhGHhoQGRoRCnBoF28YHwFPWGhtHUJkEBkaEQpwaBdo e3sfbBxkYllrTxAZGhEKcGwXYkBabVBBQ2NwX20QHhIRCm1+FxoRClhNF0sRIA== X-PDR: PASS X-ServerName: mx2.suse.de X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:137.65.0.0/16 ip4:151.155.28.0/17 ip4:149.44.0.0/16 ip4:147.2.0.0/16 ip4:164.99.0.0/16 ip4:130.57.0.0/16 ip4:192.31.114.0/24 ip4:195.135.221.0/24 ip4:195.135.220.0/24 ip4:69.7.179.0/24 ip4:150.215.214.0/24 include:mailcontrol.com ~all X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8595 signatures=668517 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=30 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=180 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000 definitions=main-1707180257 Cc: Jan Kara , ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 1/2] ocfs2: Make ocfs2_set_acl() static 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: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-Virus-Scanned: ClamAV using ClamSMTP The function is never called outside of fs/ocfs2/acl.c. CC: Joel Becker CC: ocfs2-devel@oss.oracle.com Signed-off-by: Jan Kara --- fs/ocfs2/acl.c | 2 +- fs/ocfs2/acl.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index dc22ba8c710f..3b9c3638a381 100644 --- a/fs/ocfs2/acl.c +++ b/fs/ocfs2/acl.c @@ -221,7 +221,7 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, /* * Set the access or default ACL of an inode. */ -int ocfs2_set_acl(handle_t *handle, +static int ocfs2_set_acl(handle_t *handle, struct inode *inode, struct buffer_head *di_bh, int type, diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h index 2783a75b3999..7be0bb756286 100644 --- a/fs/ocfs2/acl.h +++ b/fs/ocfs2/acl.h @@ -28,13 +28,6 @@ struct ocfs2_acl_entry { struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type); int ocfs2_iop_set_acl(struct inode *inode, struct posix_acl *acl, int type); -int ocfs2_set_acl(handle_t *handle, - struct inode *inode, - struct buffer_head *di_bh, - int type, - struct posix_acl *acl, - struct ocfs2_alloc_context *meta_ac, - struct ocfs2_alloc_context *data_ac); extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *); extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *, struct buffer_head *, struct buffer_head *,