From patchwork Sun Jan 6 03:53:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerie Aurora X-Patchwork-Id: 209724 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D81582C0087 for ; Sun, 6 Jan 2013 15:09:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755574Ab3AFEJ3 (ORCPT ); Sat, 5 Jan 2013 23:09:29 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:36393 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755234Ab3AFEJ3 (ORCPT ); Sat, 5 Jan 2013 23:09:29 -0500 Received: by mail-pa0-f42.google.com with SMTP id rl6so10049190pac.15 for ; Sat, 05 Jan 2013 20:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=FUyduxviSIN4RyDMzKlIfUsEAa+Dkv+AYFHMZ4LsOuY=; b=co5vXnN3bGaNUCZNQmk9z2hs6rGVaQnz/+dxc6gcGOicDvWrN92TsaU07Ps5k4y0S0 GKDnXtbFHgXv0zM3fLQJ2qKbY2CLuw6vXS/Es2rXM7veBgQwejyXT3rVwQBg9QQuE5+u /WuN2mAUtBg1vm6+oloUp0vvfPmyxHtMO25iOdoPF85OJZwzd1G7zPTHk70cgkbpkPTv 2Difv70j5Mym2lr2Kc0MdQ+bznO9jkVTybkmaDXfoZWITVJt12xDdizSffweQeK7SDHO WLqwftsJxNibVKcuYPYMk4hEfDUgBdhR/Lq+IF5okN5D8ED+ZuMdxYxPzAnp4/SAIFfg LV2w== X-Received: by 10.68.232.71 with SMTP id tm7mr176379879pbc.118.1357445367835; Sat, 05 Jan 2013 20:09:27 -0800 (PST) Received: from linuxmint.gateway.2wire.net (c-71-198-35-26.hsd1.ca.comcast.net. [71.198.35.26]) by mx.google.com with ESMTPS id rk6sm35115214pbc.20.2013.01.05.20.09.26 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Jan 2013 20:09:26 -0800 (PST) From: Valerie Aurora To: linux-ext4@vger.kernel.org Cc: Valerie Aurora , "Theodore Ts'o" , David Brown , Eric Sandeen , Jan Kara , Tao Ma Subject: [PATCH] ext4: fix configuration dependencies for ext4 ACLs and security labels Date: Sat, 5 Jan 2013 19:53:09 -0800 Message-Id: <1357444389-4895-1-git-send-email-val@vaaconsulting.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Commit "ext4: Remove CONFIG_EXT4_FS_XATTR" removed the configuration dependencies for ext4 xattrs from the ext4 ACLs and security labels configuration options, but did not replace them with a dependency on ext4 itself. Add back the dependency on ext4 so the options only show up if ext4 is enabled. Signed-off-by: Valerie Aurora Acked-by: Tao Ma --- fs/ext4/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 0a475c8..9873587 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -41,6 +41,7 @@ config EXT4_USE_FOR_EXT23 config EXT4_FS_POSIX_ACL bool "Ext4 POSIX Access Control Lists" + depends on EXT4_FS select FS_POSIX_ACL help POSIX Access Control Lists (ACLs) support permissions for users and @@ -53,6 +54,7 @@ config EXT4_FS_POSIX_ACL config EXT4_FS_SECURITY bool "Ext4 Security Labels" + depends on EXT4_FS help Security labels support alternative access control models implemented by security modules like SELinux. This option