From patchwork Fri Mar 27 16:50: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: 6110551 Return-Path: X-Original-To: patchwork-linux-nfs@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 DF17D9F399 for ; Fri, 27 Mar 2015 17:02:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 145442035E for ; Fri, 27 Mar 2015 17:02:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F659203DA for ; Fri, 27 Mar 2015 17:02:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329AbbC0Qvy (ORCPT ); Fri, 27 Mar 2015 12:51:54 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36655 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752839AbbC0Qvu (ORCPT ); Fri, 27 Mar 2015 12:51:50 -0400 Received: by wibg7 with SMTP id g7so33214257wib.1; Fri, 27 Mar 2015 09:51:47 -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=iHSzSPvOxJ/+ZxpHIuOG4Y2UEBc2+6nryaEiwUZkEYk=; b=H4zNRmjQml5Mmq7snlg1kMisDs0XFB79rwIQdJkCBe4vXCP2tWwzV5i8rgBBffYhz6 F9AZCe7lhW9k+HO51OUYdPFFaBeOqLhQ1nWU69LLOtYf94rg9Y5lljH9iJ0+r47Hamg+ +ZmbgVUYHYfJZ5ZaNdbaCXmU5FDqEKc6wofUkTqvthhkGaCv0tmoNpiHgvRLaUqFsaoM RRqNvFulEw/ZjQeA3EFRDkkrjrB0gaLeMGaoyAppkGHn+yG1jb4+wmXo2FRkWlz89DJ7 bkE3wpxJYGsoa0oP5Je6/mEwIIZLArO2qOJFYuOVNvcqsY6+8MJmcGw+cyfZs513kOCf q4Ww== X-Received: by 10.180.87.165 with SMTP id az5mr48726483wib.29.1427475107327; Fri, 27 Mar 2015 09:51:47 -0700 (PDT) Received: from nuc.home.com (80-110-94-70.cgn.dynamic.surfer.at. [80.110.94.70]) by mx.google.com with ESMTPSA id j7sm3592306wix.4.2015.03.27.09.51.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 09:51:46 -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 07/39] vfs: Make the inode passed to inode_change_ok non-const Date: Fri, 27 Mar 2015 17:50:05 +0100 Message-Id: <17e0f0da452317ba05c035b0c23bd96966ea0e81.1427471526.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);