From 7d6777727a80f9cf7a8a8e20ecce21cc09adb8f6 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 24 Apr 2006 14:14:42 -0400
Subject: [PATCH] --- yaml --- r: 38662 b: refs/heads/master c:
 b5ea3e1ef307548bdd40fff6aba5fc96b002f284 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/gfs2/Kconfig  | 26 ++++++++++++--------------
 trunk/fs/gfs2/Makefile | 42 +++++-------------------------------------
 3 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/[refs] b/[refs]
index 1054068623bb..9f2416683427 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b800a1cb3940f216c4e5c963007a1f72fca0f15f
+refs/heads/master: b5ea3e1ef307548bdd40fff6aba5fc96b002f284
diff --git a/trunk/fs/gfs2/Kconfig b/trunk/fs/gfs2/Kconfig
index 17cb44bea1c0..115f30d8c22e 100644
--- a/trunk/fs/gfs2/Kconfig
+++ b/trunk/fs/gfs2/Kconfig
@@ -1,19 +1,17 @@
 config GFS2_FS
-        tristate "GFS2 file system support"
-	default m
+	tristate "GFS2 file system support"
 	depends on EXPERIMENTAL
-        select FS_POSIX_ACL
-        select SYSFS
-        help
-        A cluster filesystem.
-
-        Allows a cluster of computers to simultaneously use a block device
-        that is shared between them (with FC, iSCSI, NBD, etc...).  GFS reads
-        and writes to the block device like a local filesystem, but also uses
-        a lock module to allow the computers coordinate their I/O so
-        filesystem consistency is maintained.  One of the nifty features of
-        GFS is perfect consistency -- changes made to the filesystem on one
-        machine show up immediately on all other machines in the cluster.
+	select FS_POSIX_ACL
+	help
+	A cluster filesystem.
+
+	Allows a cluster of computers to simultaneously use a block device
+	that is shared between them (with FC, iSCSI, NBD, etc...).  GFS reads
+	and writes to the block device like a local filesystem, but also uses
+	a lock module to allow the computers coordinate their I/O so
+	filesystem consistency is maintained.  One of the nifty features of
+	GFS is perfect consistency -- changes made to the filesystem on one
+	machine show up immediately on all other machines in the cluster.
 
 	To use the GFS2 filesystem, you will need to enable one or more of
 	the below locking modules. Documentation and utilities for GFS2 can
diff --git a/trunk/fs/gfs2/Makefile b/trunk/fs/gfs2/Makefile
index 88f927948113..66de2cc7bb5a 100644
--- a/trunk/fs/gfs2/Makefile
+++ b/trunk/fs/gfs2/Makefile
@@ -1,41 +1,9 @@
 obj-$(CONFIG_GFS2_FS) += gfs2.o
-gfs2-y := \
-	acl.o \
-	bits.o \
-	bmap.o \
-	daemon.o \
-	dir.o \
-	eaops.o \
-	eattr.o \
-	glock.o \
-	glops.o \
-	inode.o \
-	lm.o \
-	log.o \
-	lops.o \
-	locking.o \
-	lvb.o \
-	main.o \
-	meta_io.o \
-	mount.o \
-	ondisk.o \
-	ops_address.o \
-	ops_dentry.o \
-	ops_export.o \
-	ops_file.o \
-	ops_fstype.o \
-	ops_inode.o \
-	ops_super.o \
-	ops_vm.o \
-	page.o \
-	quota.o \
-	recovery.o \
-	rgrp.o \
-	super.o \
-	sys.o \
-	trans.o \
-	unlinked.o \
-	util.o
+gfs2-y := acl.o bits.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
+	glops.o inode.o lm.o log.o lops.o locking.o lvb.o main.o meta_io.o \
+	mount.o ondisk.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
+	ops_fstype.o ops_inode.o ops_super.o ops_vm.o page.o quota.o \
+	recovery.o rgrp.o super.o sys.o trans.o unlinked.o util.o
 
 obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/
 obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/