From patchwork Fri Apr 24 11:04:05 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: 6269021 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 4C0F1BF4A6 for ; Fri, 24 Apr 2015 11:20:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7014420251 for ; Fri, 24 Apr 2015 11:20:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D8F8202D1 for ; Fri, 24 Apr 2015 11:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966532AbbDXLUC (ORCPT ); Fri, 24 Apr 2015 07:20:02 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:35324 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516AbbDXLFD (ORCPT ); Fri, 24 Apr 2015 07:05:03 -0400 Received: by wgyo15 with SMTP id o15so46701208wgy.2; Fri, 24 Apr 2015 04:05:01 -0700 (PDT) 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=QEMwKsWNy/La+x1iVoDDpkgadxyXlz/Vxtmb43vgSJ0=; b=e4OQ1+rq0drK6NGnaqhS0eBUagN6oT5cBiVNat1G6XlTmhrv14xMT+aqspHTS3FXas hIyL3CwSXffZQFRs45BuQDaz+MVkomPGO+XPQHAjVUMi8PUZYcGJUc5w127jtwYg2+k5 kwW2yJtX7Od7T2Tgxag1LZ7q6PUyEUKLf4bffM7F4qnb+7YAuEniCS+YEz00MwMvbS+W 0ZUeNJRIzOMFTlpHu5K/jlZjVpV5B6VC2vxADGgUS+7RnIZZhW3N+NNDCrLANPmxFHIu tI5atWNtdkokYZv4pRBouqgGOMsRHSstehRMWiUKUqm9c9+Ws9k3lMtXsmt7WlIXeyFe dAnA== X-Received: by 10.194.184.146 with SMTP id eu18mr14390134wjc.94.1429873501323; Fri, 24 Apr 2015 04:05:01 -0700 (PDT) Received: from nuc.home.com (80-110-112-232.cgn.dynamic.surfer.at. [80.110.112.232]) by mx.google.com with ESMTPSA id ch6sm16410648wjc.3.2015.04.24.04.04.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 04:05:00 -0700 (PDT) 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 v3 08/45] vfs: Make the inode passed to inode_change_ok non-const Date: Fri, 24 Apr 2015 13:04:05 +0200 Message-Id: <8cbbe267f6041fd1b112215ff8cc7557af61e2f7.1429868795.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 5701f90..8347f81 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2761,7 +2761,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);