From patchwork Wed Jun 24 21:56:53 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: 6670731 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 8660FC05AC for ; Wed, 24 Jun 2015 22:04:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB66720569 for ; Wed, 24 Jun 2015 22:04:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC09F20547 for ; Wed, 24 Jun 2015 22:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbbFXV5x (ORCPT ); Wed, 24 Jun 2015 17:57:53 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:36384 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751578AbbFXV5i (ORCPT ); Wed, 24 Jun 2015 17:57:38 -0400 Received: by wguu7 with SMTP id u7so47185668wgu.3; Wed, 24 Jun 2015 14:57:36 -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; bh=DcHDEJ2kJQw9ayxLA4EzBrKzmpev1NxJ7aHskUQj71A=; b=0P60Y9ZRiEfIJUyvJYE3cvGR3uuUY3gxxPsWE6HjBJKJUa+vNRJa2oMJqzLz0baACw RL3e05dkGTeUkJlTUEwAKm3XJdJXfqkuByxmo4WElOBdeeeEkhw4N1InnP7+pSySRYlr zCrQfIWbK3pNZY/g97Fmu+etb94KqYIdfrB+48KCJhpDW6+t+GPh2NrF4Ne9/c5wzqbO f6RVcEqq6H1GZFM5Lq2GDRUWZKrNBtMmpuLy1h8D5tz8BvkKFEL19d4ZdLGrhnVYKdCH 8gSaPNCNywuDSdMeXqiv5tqHSAARVsYTOowShbIWkwwGpSE7taeE8BbAcBLguuLRr2Ia 5QEw== X-Received: by 10.180.97.7 with SMTP id dw7mr8669883wib.74.1435183056333; Wed, 24 Jun 2015 14:57:36 -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 lu5sm42559880wjb.9.2015.06.24.14.57.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 14:57:35 -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, linux-api@vger.kernel.org, samba-technical@lists.samba.org, linux-security-module@vger.kernel.org Subject: [RFC v4 04/31] vfs: Make the inode passed to inode_change_ok non-const Date: Wed, 24 Jun 2015 23:56:53 +0200 Message-Id: <1435183040-22726-5-git-send-email-agruenba@redhat.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1435183040-22726-1-git-send-email-agruenba@redhat.com> References: <1435183040-22726-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=-5.7 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=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 96a9954..b98b211 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2820,7 +2820,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);