From patchwork Tue Aug 4 11:53:02 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: 6938301 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 09E28C05AC for ; Tue, 4 Aug 2015 12:12:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 350D320395 for ; Tue, 4 Aug 2015 12:12:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7E202047B for ; Tue, 4 Aug 2015 12:12:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756105AbbHDMLy (ORCPT ); Tue, 4 Aug 2015 08:11:54 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:34498 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933511AbbHDLyg (ORCPT ); Tue, 4 Aug 2015 07:54:36 -0400 Received: by wibud3 with SMTP id ud3so173531722wib.1; Tue, 04 Aug 2015 04:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3cND0zntjJNb2euxT8atpA/QpaJ/VjIxeze/oOtvKCo=; b=s3xft5XCc+rwOFPKp0Ie+HO/JegNpCkiSIIOg9bXyq59KwF6uIsvdzqmU0dzjnBD5K xS0BE96lkPqPDQxrIkBoRQYcYq+YOSMoajDh0q4sT6MtBclcwE5hJ28PuOrrAJhQ0vnw myzuSErukXMg0/cJ9wH5Zg14HQ5UpnaHeICsDLZ5Uuv9KbNCGLRgJD1RStV9DCNmj+lA XVQ4JtrBUR51hpgS9UrWqx3Ilpf7QbRXNpLQu5WpdZblE2zXmoIidBVdl8YtFOvDGJ5c 8PRE2wJVrkXXID8f85gUozbCpDJhiwDb5vz3P3UnEblcv1YKMiGQjnLoXVoyLa/ui2oG 0m5w== X-Received: by 10.195.11.74 with SMTP id eg10mr7052170wjd.33.1438689273744; Tue, 04 Aug 2015 04:54:33 -0700 (PDT) Received: from schleppi.home.com (p54980F84.dip0.t-ipconnect.de. [84.152.15.132]) by smtp.gmail.com with ESMTPSA id u7sm2018458wif.3.2015.08.04.04.54.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Aug 2015 04:54:32 -0700 (PDT) From: Andreas Gruenbacher X-Google-Original-From: Andreas Gruenbacher To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-api@vger.kernel.org, linux-cifs@vger.kernel.org, linux-security-module@vger.kernel.org, Andreas Gruenbacher Subject: [RFC v6 04/40] vfs: Make the inode passed to inode_change_ok non-const Date: Tue, 4 Aug 2015 13:53:02 +0200 Message-Id: <1438689218-6921-5-git-send-email-agruenba@redhat.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1438689218-6921-1-git-send-email-agruenba@redhat.com> References: <1438689218-6921-1-git-send-email-agruenba@redhat.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, T_DKIM_INVALID, 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 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 abf5b0e..aae46e0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2873,7 +2873,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);