Commit 8ff64b53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  GFS2: Fix freeze issue
  Fix a minor bug in the previous patch
  GFS2: Clean up of glops.c
  GFS2: Fix locking bug in failed shared to exclusive conversion
  GFS2: Pagecache usage optimization on GFS2
  GFS2: fix sparse warning: Should it be static?
  GFS2: fix sparse warnings: constant is so big it is ...
  GFS2: Support quota/noquota mount arguments
  GFS2: Fix alignment issue and tidy gfs2_bitfit
  GFS2: Add a "demote a glock" interface to sysfs
  GFS2: Expose UUID via sysfs/uevent
  GFS2: Support generation of discard requests
  GFS2: Fix deadlock on journal flush
  GFS2: Fix error path ref counting for root inode
  GFS2: Remove unused field from glock
  GFS2: Merge lock_dlm module into GFS2
  GFS2: Remove "double" locking in quota
  GFS2: change gfs2_quota_scan into a shrinker
  GFS2: Bring back lvb-related stuff to lock_nolock to support quotas
  GFS2: Fix remount argument parsing
parents 61a9dc26 df3647b2

fs/gfs2/Kconfig

+10 −7
Original line number Diff line number Diff line 
config GFS2_FS

	tristate "GFS2 file system support"

	depends on EXPERIMENTAL && (64BIT || LBD)

	select DLM if GFS2_FS_LOCKING_DLM

	select CONFIGFS_FS if GFS2_FS_LOCKING_DLM

	select SYSFS if GFS2_FS_LOCKING_DLM

	select IP_SCTP if DLM_SCTP

	select FS_POSIX_ACL

	select CRC32

	help
@@ -18,17 +22,16 @@ config GFS2_FS 
	  the locking module below. Documentation and utilities for GFS2 can

	  be found here: http://sources.redhat.com/cluster



	  The "nolock" lock module is now built in to GFS2 by default.

	  The "nolock" lock module is now built in to GFS2 by default. If

	  you want to use the DLM, be sure to enable HOTPLUG and IPv4/6

	  networking.



config GFS2_FS_LOCKING_DLM

	tristate "GFS2 DLM locking module"

	depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)

	select IP_SCTP if DLM_SCTP

	select CONFIGFS_FS

	select DLM

	bool "GFS2 DLM locking"

	depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && HOTPLUG

	help

	  Multiple node locking module for GFS2



	  Most users of GFS2 will require this module. It provides the locking

	  Most users of GFS2 will require this. It provides the locking

	  interface between GFS2 and the DLM, which is required to use GFS2

	  in a cluster environment.

fs/gfs2/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_GFS2_FS) += gfs2.o

gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \

	glops.o inode.o log.o lops.o locking.o main.o meta_io.o \

	glops.o inode.o log.o lops.o main.o meta_io.o \

	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \

	ops_fstype.o ops_inode.o ops_super.o quota.o \

	recovery.o rgrp.o super.o sys.o trans.o util.o



obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/

gfs2-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o

fs/gfs2/acl.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/posix_acl.h>

#include <linux/posix_acl_xattr.h>

#include <linux/gfs2_ondisk.h>

#include <linux/lm_interface.h>



#include "gfs2.h"

#include "incore.h"

fs/gfs2/bmap.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/buffer_head.h>

#include <linux/gfs2_ondisk.h>

#include <linux/crc32.h>

#include <linux/lm_interface.h>



#include "gfs2.h"

#include "incore.h"

fs/gfs2/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#include <linux/gfs2_ondisk.h>

#include <linux/crc32.h>

#include <linux/vmalloc.h>

#include <linux/lm_interface.h>



#include "gfs2.h"

#include "incore.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE