aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-04-24 14:14:42 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-24 14:14:42 -0400
commitb5ea3e1ef307548bdd40fff6aba5fc96b002f284 (patch)
tree9e6872147f473cea11086758e4a70f29655eb276 /fs
parentb800a1cb3940f216c4e5c963007a1f72fca0f15f (diff)
[GFS2] Tidy up Makefile & Kconfig
Remove select of SYSFS as requested by Greg KH. Change whitespace to tabs rather than spaces in places where it was incorrect and removed 'default m' as suggested by Adrian Bunk. Reorganised Makefile as suggested by Sam Ravnborg. Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Adrian Bunk <bunk@stusta.de> Cc: Greg KH <greg@kroah.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/Kconfig26
-rw-r--r--fs/gfs2/Makefile42
2 files changed, 17 insertions, 51 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 17cb44bea1c0..115f30d8c22e 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -1,19 +1,17 @@
1config GFS2_FS 1config GFS2_FS
2 tristate "GFS2 file system support" 2 tristate "GFS2 file system support"
3 default m
4 depends on EXPERIMENTAL 3 depends on EXPERIMENTAL
5 select FS_POSIX_ACL 4 select FS_POSIX_ACL
6 select SYSFS 5 help
7 help 6 A cluster filesystem.
8 A cluster filesystem. 7
9 8 Allows a cluster of computers to simultaneously use a block device
10 Allows a cluster of computers to simultaneously use a block device 9 that is shared between them (with FC, iSCSI, NBD, etc...). GFS reads
11 that is shared between them (with FC, iSCSI, NBD, etc...). GFS reads 10 and writes to the block device like a local filesystem, but also uses
12 and writes to the block device like a local filesystem, but also uses 11 a lock module to allow the computers coordinate their I/O so
13 a lock module to allow the computers coordinate their I/O so 12 filesystem consistency is maintained. One of the nifty features of
14 filesystem consistency is maintained. One of the nifty features of 13 GFS is perfect consistency -- changes made to the filesystem on one
15 GFS is perfect consistency -- changes made to the filesystem on one 14 machine show up immediately on all other machines in the cluster.
16 machine show up immediately on all other machines in the cluster.
17 15
18 To use the GFS2 filesystem, you will need to enable one or more of 16 To use the GFS2 filesystem, you will need to enable one or more of
19 the below locking modules. Documentation and utilities for GFS2 can 17 the below locking modules. Documentation and utilities for GFS2 can
diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile
index 88f927948113..66de2cc7bb5a 100644
--- a/fs/gfs2/Makefile
+++ b/fs/gfs2/Makefile
@@ -1,41 +1,9 @@
1obj-$(CONFIG_GFS2_FS) += gfs2.o 1obj-$(CONFIG_GFS2_FS) += gfs2.o
2gfs2-y := \ 2gfs2-y := acl.o bits.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
3 acl.o \ 3 glops.o inode.o lm.o log.o lops.o locking.o lvb.o main.o meta_io.o \
4 bits.o \ 4 mount.o ondisk.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
5 bmap.o \ 5 ops_fstype.o ops_inode.o ops_super.o ops_vm.o page.o quota.o \
6 daemon.o \ 6 recovery.o rgrp.o super.o sys.o trans.o unlinked.o util.o
7 dir.o \
8 eaops.o \
9 eattr.o \
10 glock.o \
11 glops.o \
12 inode.o \
13 lm.o \
14 log.o \
15 lops.o \
16 locking.o \
17 lvb.o \
18 main.o \
19 meta_io.o \
20 mount.o \
21 ondisk.o \
22 ops_address.o \
23 ops_dentry.o \
24 ops_export.o \
25 ops_file.o \
26 ops_fstype.o \
27 ops_inode.o \
28 ops_super.o \
29 ops_vm.o \
30 page.o \
31 quota.o \
32 recovery.o \
33 rgrp.o \
34 super.o \
35 sys.o \
36 trans.o \
37 unlinked.o \
38 util.o
39 7
40obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/ 8obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/
41obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/ 9obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/