Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a61f173 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6: (292 commits)
  [GFS2] Fix endian bug for de_type
  [GFS2] Initialize SELinux extended attributes at inode creation time.
  [GFS2] Move logging code into log.c (mostly)
  [GFS2] Mark nlink cleared so VFS sees it happen
  [GFS2] Two redundant casts removed
  [GFS2] Remove uneeded endian conversion
  [GFS2] Remove duplicate sb reading code
  [GFS2] Mark metadata reads for blktrace
  [GFS2] Remove iflags.h, use FS_
  [GFS2] Fix code style/indent in ops_file.c
  [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix
  [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits)
  [GFS2] inode-diet: Eliminate i_blksize from the inode structure
  [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs)
  [GFS2] Fix typo in last patch
  [GFS2] Fix direct i/o logic in filemap.c
  [GFS2] Fix bug in Makefiles for lock modules
  [GFS2] Remove (extra) fs_subsys declaration
  [GFS2/DLM] Fix trailing whitespace
  [GFS2] Tidy up meta_io code
  ...
parents d002ec48 7ecdb70a

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -3578,11 +3578,11 @@ S: Fargo, North Dakota 58122 
S: USA



N: Steven Whitehouse

E: SteveW@ACM.org

E: steve@chygwyn.com

W: http://www.chygwyn.com/~steve

D: Linux DECnet project: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html

D: Linux DECnet project

D: Minor debugging of other networking protocols.

D: Misc bug fixes and filesystem development

D: Misc bug fixes and GFS2 filesystem development



N: Hans-Joachim Widmaier

E: hjw@zvw.de

Documentation/filesystems/gfs2.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
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_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 help mount(8) mount a filesystem

  mkfs.gfs2	to make a filesystem

MAINTAINERS

+18 −0
Original line number Diff line number Diff line
@@ -898,6 +898,16 @@ M: jack@suse.cz 
L:	linux-kernel@vger.kernel.org

S:	Maintained



DISTRIBUTED LOCK MANAGER

P:	Patrick Caulfield

M:	pcaulfie@redhat.com

P:	David Teigland

M:	teigland@redhat.com

L:	cluster-devel@redhat.com

W:	http://sources.redhat.com/cluster/

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git

S:	Supported



DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER

P:	Tobias Ringstrom

M:	tori@unhappy.mine.nu
@@ -1173,6 +1183,14 @@ M: khc@pm.waw.pl 
W:	http://www.kernel.org/pub/linux/utils/net/hdlc/

S:	Maintained



GFS2 FILE SYSTEM

P:	Steven Whitehouse

M:	swhiteho@redhat.com

L:	cluster-devel@redhat.com

W:	http://sources.redhat.com/cluster/

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git

S:	Supported



GIGASET ISDN DRIVERS

P:	Hansjoerg Lipp

M:	hjlipp@web.de

fs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ config FS_POSIX_ACL 
	default n



source "fs/xfs/Kconfig"

source "fs/gfs2/Kconfig"



config OCFS2_FS

	tristate "OCFS2 file system support"
@@ -1995,6 +1996,7 @@ endmenu 
endif



source "fs/nls/Kconfig"

source "fs/dlm/Kconfig"



endmenu

fs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ obj-$(CONFIG_CONFIGFS_FS) += configfs/ 
obj-y				+= devpts/



obj-$(CONFIG_PROFILING)		+= dcookies.o

obj-$(CONFIG_DLM)		+= dlm/

 

# Do not add any filesystems before this line

obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
@@ -110,3 +111,4 @@ obj-$(CONFIG_HOSTFS) += hostfs/ 
obj-$(CONFIG_HPPFS)		+= hppfs/

obj-$(CONFIG_DEBUG_FS)		+= debugfs/

obj-$(CONFIG_OCFS2_FS)		+= ocfs2/

obj-$(CONFIG_GFS2_FS)           += gfs2/