From patchwork Thu Jan 26 01:06:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9538267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ABDF7604A9 for ; Thu, 26 Jan 2017 01:07:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A7FC27E33 for ; Thu, 26 Jan 2017 01:07:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EE9C27FA6; Thu, 26 Jan 2017 01:07:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C604527F99 for ; Thu, 26 Jan 2017 01:07:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752425AbdAZBHe (ORCPT ); Wed, 25 Jan 2017 20:07:34 -0500 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33370 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380AbdAZBHd (ORCPT ); Wed, 25 Jan 2017 20:07:33 -0500 Received: by mail-pf0-f170.google.com with SMTP id y143so61956211pfb.0 for ; Wed, 25 Jan 2017 17:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=7takMW+9ma67mppE6BvEGb8eKvds4zyLeSwjR7ZWkZM=; b=DFXS27g4i6iwX3Ql/EXNg5aLwp0ke2iOwD5G+tfny6pwGxn45SEZLuqi8+wZh0ldgX gX8ZaHDn7qriKvESirJv4/I2wZH74mfVQde/B5IJuzQ4WNG0Xluyg92h9KIJ67ghLqoA IctSr25XrFqlBr8+PDlyVqg69aHgFBwSP9o/q0nYaxnrxVzpAKmy6rOqJgqruyYF4vqR QnUXTnGXdOTTkOR2q+kbw+RXAL/hATUuG3b8jqG8GXzaMtPYtr03AjaVAq7/jJCnqERO 6LIJyBHothP7GBVoRrF96XQ87yyYerAnWZO19S+5patcicOIkyYSjBuxVuPD6T/GIycZ Slsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=7takMW+9ma67mppE6BvEGb8eKvds4zyLeSwjR7ZWkZM=; b=KDGAE8hfKNK9R8DVNVohUM5qOYp9q18NPMqS6h9CpMrWcN6YlU57efdXQglZq+Zv9+ dqqIpVf3woTM1Gb8NCBfU8MMQS1CxNAmc7UJbx/LlpbRrlq0HGi6p7bkFRFMsNVT4+JN DcPmhj3RJcmxMkQxBFP8xE/7JcZeJ6LMOs47HJFcpmp6Wnk5VbMPa6EYyTvse2k9/x5/ nazJR3UdvUyYqZzm+HZMk4rtAsKKZb8psuYo1XzZ1V3/fqm3b4GyVJH9Ra6sGqMNj6/H MvwqoNCEIxV4XOwHYhX4l1f5LhLyJW2SzJa4kUYTXZlnh06gdWu185EdPyKJBbHgtzpy akbw== X-Gm-Message-State: AIkVDXKrM/QBE7rZD4XLWpnjQNsvCkpEP9M5LUoxpi5ql5RVn29yzsRX716iy4rgU9VGY1Av X-Received: by 10.98.110.194 with SMTP id j185mr235812pfc.157.1485392843001; Wed, 25 Jan 2017 17:07:23 -0800 (PST) Received: from localhost.localdomain ([2601:602:8801:8110:e6a7:a0ff:fe0b:c9a8]) by smtp.gmail.com with ESMTPSA id w25sm146848pge.9.2017.01.25.17.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 17:07:22 -0800 (PST) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: Chris Murphy , Andreas Gruenbacher , stable@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v2 3/3] Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations Date: Wed, 25 Jan 2017 17:06:40 -0800 Message-Id: <14d5cbf62169b1ac773028fa3ce0da246b968134.1485392101.git.osandov@fb.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval Subvolume directory inodes can't have ACLs. Cc: # 4.9.x Signed-off-by: Omar Sandoval Reviewed-by: David Sterba --- fs/btrfs/inode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 924f3583a04d..1b21a63ed328 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10577,8 +10577,6 @@ static const struct inode_operations btrfs_dir_inode_operations = { static const struct inode_operations btrfs_dir_ro_inode_operations = { .lookup = btrfs_lookup, .permission = btrfs_permission, - .get_acl = btrfs_get_acl, - .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, };