Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
  [GFS2] make gfs2_writepages() static
  [GFS2] Unlock page on prepare_write try lock failure
  [GFS2] nfsd readdirplus assertion failure
  [DLM] fix softlockup in dlm_recv
  [DLM] zero new user lvbs
  [DLM/GFS2] indent help text
  [GFS2] Fix unlink deadlocks
  [GFS2] Put back semaphore to avoid umount problem
  [GFS2] more CURRENT_TIME_SEC
  [GFS2/DLM] fix GFS2 circular dependency
  [GFS2/DLM] use sysfs
  [GFS2] make lock_dlm drop_count tunable in sysfs
  [GFS2] increase default lock limit
  [GFS2] Fix list corruption in lops.c
  [GFS2] Fix recursive locking attempt with NFS
  [DLM] can miss clearing resend flag
  [DLM] saved dlm message can be dropped
  [DLM] Make sock_sem into a mutex
  [GFS2] Fix typo in glock.c
  [GFS2] use CURRENT_TIME_SEC instead of get_seconds in gfs2
  ...

1 files changed, 23 insertions, 24 deletions

diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 6a2ffa2db14f..de8e64c03f73 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -4,44 +4,43 @@ config GFS2_FS
         select FS_POSIX_ACL
         select CRC32
         help
-        A cluster filesystem.
+          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.
+          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
-        be found here: http://sources.redhat.com/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
+          be found here: http://sources.redhat.com/cluster
 
 config GFS2_FS_LOCKING_NOLOCK
         tristate "GFS2 \"nolock\" locking module"
         depends on GFS2_FS
         help
-        Single node locking module for GFS2.
+          Single node locking module for GFS2.
 
-        Use this module if you want to use GFS2 on a single node without
-        its clustering features. You can still take advantage of the
-        large file support, and upgrade to running a full cluster later on
-        if required.
+          Use this module if you want to use GFS2 on a single node without
+          its clustering features. You can still take advantage of the
+          large file support, and upgrade to running a full cluster later on
+          if required.
 
-        If you will only be using GFS2 in cluster mode, you do not need this
-        module.
+          If you will only be using GFS2 in cluster mode, you do not need this
+          module.
 
 config GFS2_FS_LOCKING_DLM
         tristate "GFS2 DLM locking module"
-        depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
+        depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)
         select IP_SCTP if DLM_SCTP
         select CONFIGFS_FS
         select DLM
         help
-        Multiple node locking module for GFS2
-
-        Most users of GFS2 will require this module. It provides the locking
-        interface between GFS2 and the DLM, which is required to use GFS2
-        in a cluster environment.
+          Multiple node locking module for GFS2
 
+          Most users of GFS2 will require this module. It provides the locking
+          interface between GFS2 and the DLM, which is required to use GFS2
+          in a cluster environment.