2 files changed, 45 insertions, 0 deletions

diff --git a/Documentation/filesystems/gfs2.txt b/Documentation/filesystems/gfs2.txt
new file mode 100644
index 000000000000..a20ba19e9fe5
--- /dev/null
+++ b/Documentation/filesystems/gfs2.txt
@@ -0,0 +1,44 @@
+Global File System
+------------------
+
+http://sources.redhat.com/cluster/
+
+GFS is a cluster file system. It 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
+file system, but also uses a lock module to allow the computers coordinate
+their I/O so file system consistency is maintained.  One of the nifty
+features of GFS is perfect consistency -- changes made to the file system
+on one machine show up immediately on all other machines in the cluster.
+
+GFS uses interchangable inter-node locking mechanisms.  Different lock
+modules can plug into GFS and each file system selects the appropriate
+lock module at mount time.  Lock modules include:
+
+  lock_nolock -- allows gfs to be used as a local file system
+
+  lock_dlm -- uses a distributed lock manager (dlm) for inter-node locking
+  The dlm is found at linux/fs/dlm/
+
+In addition to interfacing with an external locking manager, a gfs lock
+module is responsible for interacting with external cluster management
+systems.  Lock_dlm depends on user space cluster management systems found
+at the URL above.
+
+To use gfs as a local file system, no external clustering systems are
+needed, simply:
+
+  $ mkfs -t gfs2 -p lock_nolock -j 1 /dev/block_device
+  $ mount -t gfs2 /dev/block_device /dir
+
+GFS2 is not on-disk compatible with previous versions of GFS.
+
+The following man pages can be found at the URL above:
+  gfs2_mkfs     to make a filesystem
+  gfs2_fsck     to repair a filesystem
+  gfs2_grow     to expand a filesystem online
+  gfs2_jadd     to add journals to a filesystem online
+  gfs2_tool     to manipulate, examine and tune a filesystem
+  gfs2_quota    to examine and change quota values in a filesystem
+  mount.gfs2    to find mount options
+
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 171a44ebd939..93a86ac23cdd 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -124,6 +124,7 @@ Code	Seq#	Include File		Comments
 'e'     00-1F   linux/video_encoder.h   conflict!
 'e'     00-1F   net/irda/irtty.h        conflict!
 'f'     00-1F   linux/ext2_fs.h
+'g'     00-1F   linux/gfs2_ioctl.h
 'h'     00-7F                           Charon filesystem
                                         <mailto:zapman@interlan.net>
 'i'     00-3F   linux/i2o.h