From patchwork Wed Feb 25 23:41:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Gr=C3=BCnbacher?= X-Patchwork-Id: 5885731 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 34BD3BF440 for ; Wed, 25 Feb 2015 23:47:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 695C320374 for ; Wed, 25 Feb 2015 23:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AB1B20268 for ; Wed, 25 Feb 2015 23:47:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbbBYXmR (ORCPT ); Wed, 25 Feb 2015 18:42:17 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:39663 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbbBYXmQ (ORCPT ); Wed, 25 Feb 2015 18:42:16 -0500 Received: by wggx12 with SMTP id x12so6803328wgg.6; Wed, 25 Feb 2015 15:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=iHSzSPvOxJ/+ZxpHIuOG4Y2UEBc2+6nryaEiwUZkEYk=; b=siuIRbUETwGevu6KDy+6QcNrZr+g36qDDKeB4GUm1LTCKd29iDCP/29AD1NhB/cVT0 iievqGBe325rbV5qHvHYKwElaMnr4YiiSgzUHp1Hemq+ZR65mgfWvD9TT4y81oYKmgb0 cD7LO9WB7hTWsXUm3iPfannLz15PVzeQgMNbYNtYd3c61Z03U0UI2GgLYG4CjZy5VLmb WkScpWGRXvnHyKaCSapUnHO+rfUcBOX1NWJD3E+gQbdMeamm2SFpl4MoUVOLVBlkCne2 jtvzfkzGDI9p2xsa6diZP2LdyQ1xNPRkFNEtf+27D2eMjjZHzyDueLmJpXMAnXVQ0egQ HLyQ== X-Received: by 10.194.110.233 with SMTP id id9mr11082802wjb.136.1424907734664; Wed, 25 Feb 2015 15:42:14 -0800 (PST) Received: from nuc.home.com (80-110-112-196.cgn.dynamic.surfer.at. [80.110.112.196]) by mx.google.com with ESMTPSA id vh8sm66946337wjc.12.2015.02.25.15.42.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2015 15:42:13 -0800 (PST) From: Andreas Gruenbacher X-Google-Original-From: Andreas Gruenbacher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org Subject: [RFC 06/21] vfs: Make the inode passed to inode_change_ok non-const Date: Thu, 26 Feb 2015 00:41:27 +0100 Message-Id: <19510de7d710a34c47eadb9b8f71881b5621574a.1424907511.git.agruenba@redhat.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 We will need to call iop->permission and iop->get_acl from inode_change_ok() for additional permission checks, and both take a non-const inode. Signed-off-by: Andreas Gruenbacher --- fs/attr.c | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index 6530ced..328be71 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -28,7 +28,7 @@ * Should be called as the first thing in ->setattr implementations, * possibly after taking additional locks. */ -int inode_change_ok(const struct inode *inode, struct iattr *attr) +int inode_change_ok(struct inode *inode, struct iattr *attr) { unsigned int ia_valid = attr->ia_valid; diff --git a/include/linux/fs.h b/include/linux/fs.h index 101abcf..f688ea6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2760,7 +2760,7 @@ extern int buffer_migrate_page(struct address_space *, #define buffer_migrate_page NULL #endif -extern int inode_change_ok(const struct inode *, struct iattr *); +extern int inode_change_ok(struct inode *, struct iattr *); extern int inode_newsize_ok(const struct inode *, loff_t offset); extern void setattr_copy(struct inode *inode, const struct iattr *attr);