Re: [PATCH -next] quota: fix QUOTACTL kconfig for gfs2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu 12-08-10 08:39:45, Randy Dunlap wrote:
> On 08/11/10 19:46, Jan Kara wrote:
> > On Wed 11-08-10 16:24:35, Randy Dunlap wrote:
> >> From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> >>
> >> warning: (GFS2_FS && BLOCK && EXPERIMENTAL && (64BIT || LBDAF)) selects QUOTACTL which has unmet direct dependencies (XFS_QUOTA || QUOTA)
> >>
> >> Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> >> Cc:	Steven Whitehouse <swhiteho@xxxxxxxxxx>
> >> Cc:	cluster-devel@xxxxxxxxxx
> >> ---
> >>  fs/quota/Kconfig |    2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> However, the "depends on" line here seems like overkill to me.
> >   OK, so do you mean that making QUOTACTL default to 'n', removing the
> > depends on line and letting QUOTA, XFS_QUOTA, and GFS2_QUOTA select
> > QUOTACTL would be better?
> 
> Yes, I think that would be better.
  OK, I've pushed the patch below to my tree.

								Honza
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
---

>From 7d67aa08b438d5c1681a2e977f8e3f2e44570305 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
Date: Tue, 17 Aug 2010 12:14:44 +0200
Subject: [PATCH] quota: Make QUOTACTL config be selected by its users

Remove "depends on" line from QUOTACTL config option and rather select
the option explicitely from config options which need it. It makes more
sense this way and also fixes Kconfig warning due to GFS2 selecting
QUOTACTL but QUOTACTL not depending on it.

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/quota/Kconfig |    4 ++--
 fs/xfs/Kconfig   |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig
index 3e21b1e..880fd98 100644
--- a/fs/quota/Kconfig
+++ b/fs/quota/Kconfig
@@ -4,6 +4,7 @@
 
 config QUOTA
 	bool "Quota support"
+	select QUOTACTL
 	help
 	  If you say Y here, you will be able to set per user limits for disk
 	  usage (also called disk quotas). Currently, it works for the
@@ -65,8 +66,7 @@ config QFMT_V2
 
 config QUOTACTL
 	bool
-	depends on XFS_QUOTA || QUOTA
-	default y
+	default n
 
 config QUOTACTL_COMPAT
 	bool
diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 480f281..6100ec0 100644
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -22,6 +22,7 @@ config XFS_FS
 config XFS_QUOTA
 	bool "XFS Quota support"
 	depends on XFS_FS
+	select QUOTACTL
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
 	  a per user and/or a per group basis under XFS.  XFS considers quota
-- 
1.6.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]
  Powered by Linux