From d3059898be24fce6037682c51fc20d2c70e8cd48 Mon Sep 17 00:00:00 2001 From: Benjamin Poirier Date: Fri, 23 Mar 2012 18:06:18 -0400 Subject: [PATCH] --- yaml --- r: 298923 b: refs/heads/master c: 97cc008aaa8c1f02699b478ca890e81810244131 h: refs/heads/master i: 298921: 9a813c761de471be54f4a075689e4278aaf16aae 298919: 914aa4716b3af4b3c1104a4776d6466f54e3bc66 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/Kconfig | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a58e03939db0..eea225640e63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1ac539ed43f273cd4d92bf7350ffd783b920184 +refs/heads/master: 97cc008aaa8c1f02699b478ca890e81810244131 diff --git a/trunk/fs/gfs2/Kconfig b/trunk/fs/gfs2/Kconfig index c465ae066c62..eb08c9e43c2a 100644 --- a/trunk/fs/gfs2/Kconfig +++ b/trunk/fs/gfs2/Kconfig @@ -1,10 +1,6 @@ config GFS2_FS tristate "GFS2 file system support" depends on (64BIT || LBDAF) - select DLM if GFS2_FS_LOCKING_DLM - select CONFIGFS_FS if GFS2_FS_LOCKING_DLM - select SYSFS if GFS2_FS_LOCKING_DLM - select IP_SCTP if DLM_SCTP select FS_POSIX_ACL select CRC32 select QUOTACTL @@ -29,7 +25,8 @@ config GFS2_FS config GFS2_FS_LOCKING_DLM bool "GFS2 DLM locking" - depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && HOTPLUG + depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \ + HOTPLUG && DLM && CONFIGFS_FS && SYSFS help Multiple node locking module for GFS2