[Cluster-devel] [GFS2 & DLM] Pull request

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

Please consider pulling the following changes from the GFS2 -fixes git tree,

Steve.

-----------------------------------------------------------------------------------------
The following changes since commit ce9e3d9953c8cb67001719b5516da2928e956be4:
  Linus Torvalds:
        Merge branch 'ubuntu-updates' of master.kernel.org:/.../bcollins/ubuntu-2.6

are found in the git repository at:

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

Adrian Bunk:
      [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): remove dead code
      [GFS2] fs/gfs2/ops_fstype.c:gfs2_get_sb_meta(): remove unused variable
      [GFS2] fs/gfs2/dir.c:gfs2_dir_write_data(): don't use an uninitialized variable
      [GFS2] fs/gfs2/ops_fstype.c:fill_super_meta(): fix NULL dereference
      [GFS2] gfs2_dir_read_data(): fix uninitialized variable usage

Al Viro:
      [GFS2] gfs2 endianness bug: be16 assigned to be32 field

Patrick Caulfield:
      [DLM] fix iovec length in recvmsg

Steven Whitehouse:
      [GFS2] Fix bmap to map extents properly

 fs/dlm/lowcomms.c     |    1 +
 fs/gfs2/bmap.c        |   13 +++++++------
 fs/gfs2/bmap.h        |    2 +-
 fs/gfs2/dir.c         |   10 +++-------
 fs/gfs2/log.c         |    6 ++++--
 fs/gfs2/ops_address.c |    6 +++---
 fs/gfs2/ops_fstype.c  |    7 ++-----
 fs/gfs2/quota.c       |    5 +++--
 fs/gfs2/recovery.c    |    5 +++--
 9 files changed, 27 insertions(+), 28 deletions(-)

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

Please consider pulling the following GFS2 & DLM bug fixes,

Steve.

The following changes since commit d1ed6a3ea10aa7b199c434f6ffd1b6761896567a:
  Linus Torvalds:
        Merge master.kernel.org:/.../davem/net-2.6

are found in the git repository at:

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

Alexey Dobriyan:
      [GFS2] don't panic needlessly

Patrick Caulfield:
      [DLM] Fix kref_put oops
      [DLM] fix oops in kref_put when removing a lockspace

Steven Whitehouse:
      [GFS2] Fix incorrect fs sync behaviour.
      [GFS2] Fix OOM error handling

 fs/dlm/lockspace.c  |   14 +++++++++++++-
 fs/gfs2/inode.c     |    3 +++
 fs/gfs2/main.c      |    4 ++--
 fs/gfs2/ops_super.c |   44 ++++++++++++++++++++++++++++----------------
 4 files changed, 46 insertions(+), 19 deletions(-)

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

Please consider pulling the following GFS2 & DLM bug fixes. The DLM fixes have
all been very well tested and in addition have been in -mm for some time. The
GFS2 fixes are both trivial "one liners" and have also been in -mm for a little
while,

Steve.

The following changes since commit 1abbfb412b1610ec3a7ec0164108cee01191d9f5:
  Mel Gorman:
        x86_64: fix bad page state in process 'swapper'

are found in the git repository at:

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

David Teigland:
      [DLM] res_recover_locks_count not reset when recover_locks is aborted
      [DLM] status messages ping-pong between unmounted nodes
      [DLM] fix requestqueue race
      [DLM] fix aborted recovery during node removal
      [DLM] fix stopping unstarted recovery
      [DLM] do full recover_locks barrier
      [DLM] clear sbflags on lock master

Steven Whitehouse:
      [GFS2] Fix Kconfig wrt CRC32
      [GFS2] Fix memory allocation in glock.c

 fs/dlm/lock.c         |   16 ++++++++++++----
 fs/dlm/member.c       |    8 ++++++++
 fs/dlm/rcom.c         |    7 ++++---
 fs/dlm/recover.c      |    1 +
 fs/dlm/recoverd.c     |   20 +++++++++++++++++++-
 fs/dlm/requestqueue.c |   21 +++++++++++++++++----
 fs/dlm/requestqueue.h |    2 +-
 fs/gfs2/Kconfig       |    1 +
 fs/gfs2/glock.c       |    2 +-
 9 files changed, 64 insertions(+), 14 deletions(-)

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

All the outstanding issues have now been resolved. Please consider
pulling the following GFS2 & DLM patches,

Steve.

---------------------------------------------------------------------------------------

The following changes since commit 0215ffb08ce99e2bb59eca114a99499a4d06e704:
  Linus Torvalds:
        Linux 2.6.19

are found in the git repository at:

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

Al Viro:
      [GFS2] split gfs2_dinode into on-disk and host variants
      [GFS2] gfs2_dinode_host fields are host-endian
      [GFS2] split gfs2_sb
      [GFS2] fields of gfs2_sb_host are host-endian
      [GFS2] split and annotate gfs2_rgrp
      [GFS2] split and annotate gfs2_inum_range
      [GFS2] split and annotate gfs2_log_head
      [GFS2] split and annotate gfs2_meta_header
      [GFS2] split and annotate gfs_rindex
      [GFS2] split and annotate gfs2_inum
      [GFS2] split and annotate gfs2_quota
      [GFS2] split and annotate gfs2_statfs_change
      [GFS2] split and annotate gfs2_quota_change
      [GFS2] gfs2 misc endianness annotations
      [GFS2] gfs2 __user misannotation fix

David Teigland:
      [DLM] res_recover_locks_count not reset when recover_locks is aborted
      [DLM] status messages ping-pong between unmounted nodes
      [DLM] fix requestqueue race
      [DLM] fix aborted recovery during node removal
      [DLM] fix stopping unstarted recovery
      [DLM] do full recover_locks barrier
      [DLM] clear sbflags on lock master
      [DLM] fix add_requestqueue checking nodes list
      [DLM] fix size of STATUS_REPLY message
      [DLM] don't accept replies to old recovery messages

Patrick Caulfield:
      [DLM] Add support for tcp communications
      [DLM] Fix DLM config
      [DLM] Clean up lowcomms

Randy Dunlap:
      [GFS2] lock function parameter

Russell Cattelan:
      [GFS2] Fix race in logging code
      [GFS2] Remove unused zero_readpage from stuffed_readpage

Ryusuke Konishi:
      [GFS2] fs/gfs2/log.c:log_bmap() fix printk format warning
      [DLM] fix format warnings in rcom.c and recoverd.c

Srinivasa Ds:
      [GFS2] Mount problem with the GFS2 code

Steven Whitehouse:
      [GFS2] Fix crc32 calculation in recovery.c
      [GFS2] Change argument of gfs2_dinode_out
      [GFS2] Change argument to gfs2_dinode_in
      [GFS2] Move gfs2_dinode_in to inode.c
      [GFS2] Change argument to gfs2_dinode_print
      [GFS2] Shrink gfs2_inode (1) - di_header/di_num
      [GFS2] Shrink gfs2_inode (2) - di_major/di_minor
      [GFS2] Shrink gfs2_inode (3) - di_mode
      [GFS2] Shrink gfs2_inode (4) - di_uid/di_gid
      [GFS2] Shrink gfs2_inode (5) - di_nlink
      [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime
      [GFS2] Shrink gfs2_inode (7) - di_payload_format
      [GFS2] Shrink gfs2_inode (8) - i_vn
      [GFS2] Tidy up 0 initialisations in inode.c
      [GFS2] Don't copy meta_header for rgrp in and out
      [GFS2] Remove unused GL_DUMP flag
      [GFS2] Fix page lock/glock deadlock
      [GFS2] Only set inode flags when required
      [GFS2] Inode number is constant
      [GFS2] Remove gfs2_inode_attr_in
      [GFS2] Fix memory allocation in glock.c
      [GFS2] Tidy up bmap & fix boundary bug
      [GFS2] Remove unused sysfs files
      [GFS2] Remove unused function from inode.c
      [GFS2] Make sentinel dirents compatible with gfs1
      [GFS2] Fix Kconfig wrt CRC32
      [GFS2] Simplify glops functions
      [GFS2] Fix glock ordering on inode creation
      [GFS2] mark_inode_dirty after write to stuffed file
      [GFS2] Fix journal flush problem
      [GFS2] Move gfs2_meta_syncfs() into log.c
      [GFS2] Reduce number of arguments to meta_io.c:getbuf()
      [GFS2] Fix recursive locking in gfs2_permission
      [GFS2] Fix recursive locking in gfs2_getattr
      [GFS2] Remove gfs2_check_acl()
      [GFS2] Add a comment about reading the super block
      [GFS2] Don't flush everything on fdatasync
      [GFS2] Fix indent in recovery.c
      [GFS2] Change gfs2_fsync() to use write_inode_now()

 fs/dlm/Kconfig              |   20 +
 fs/dlm/Makefile             |    4 
 fs/dlm/dlm_internal.h       |    4 
 fs/dlm/lock.c               |   16 -
 fs/dlm/lockspace.c          |    4 
 fs/dlm/lowcomms-sctp.c      | 1227 +++++++++++++++++++++++++++++++++++++++++++
 fs/dlm/lowcomms-tcp.c       | 1189 +++++++++++++++++++++++++++++++++++++++++
 fs/dlm/lowcomms.c           | 1239 -------------------------------------------
 fs/dlm/lowcomms.h           |    2 
 fs/dlm/main.c               |   10 
 fs/dlm/member.c             |    8 
 fs/dlm/rcom.c               |   58 ++
 fs/dlm/recover.c            |    1 
 fs/dlm/recoverd.c           |   44 +-
 fs/dlm/requestqueue.c       |   26 +
 fs/dlm/requestqueue.h       |    2 
 fs/gfs2/Kconfig             |    1 
 fs/gfs2/acl.c               |   39 -
 fs/gfs2/acl.h               |    1 
 fs/gfs2/bmap.c              |  179 +++---
 fs/gfs2/daemon.c            |    7 
 fs/gfs2/dir.c               |   93 ++-
 fs/gfs2/dir.h               |    8 
 fs/gfs2/eaops.c             |    2 
 fs/gfs2/eattr.c             |   66 +-
 fs/gfs2/eattr.h             |    6 
 fs/gfs2/glock.c             |   36 -
 fs/gfs2/glock.h             |    3 
 fs/gfs2/glops.c             |  138 +----
 fs/gfs2/incore.h            |   43 +
 fs/gfs2/inode.c             |  406 +++++---------
 fs/gfs2/inode.h             |   20 -
 fs/gfs2/log.c               |   41 +
 fs/gfs2/log.h               |    2 
 fs/gfs2/lops.c              |   40 +
 fs/gfs2/lops.h              |    2 
 fs/gfs2/meta_io.c           |   46 +-
 fs/gfs2/meta_io.h           |    1 
 fs/gfs2/ondisk.c            |  138 +----
 fs/gfs2/ops_address.c       |   52 +-
 fs/gfs2/ops_dentry.c        |    4 
 fs/gfs2/ops_export.c        |   38 +
 fs/gfs2/ops_export.h        |    2 
 fs/gfs2/ops_file.c          |   66 ++
 fs/gfs2/ops_file.h          |    2 
 fs/gfs2/ops_fstype.c        |    4 
 fs/gfs2/ops_inode.c         |  134 ++---
 fs/gfs2/ops_super.c         |   11 
 fs/gfs2/ops_vm.c            |    2 
 fs/gfs2/quota.c             |   15 -
 fs/gfs2/recovery.c          |   29 +
 fs/gfs2/recovery.h          |    2 
 fs/gfs2/rgrp.c              |   13 
 fs/gfs2/super.c             |   50 +-
 fs/gfs2/super.h             |    6 
 fs/gfs2/sys.c               |    8 
 fs/gfs2/util.h              |    6 
 include/linux/gfs2_ondisk.h |  138 ++++-
 58 files changed, 3442 insertions(+), 2312 deletions(-)
 create mode 100644 fs/dlm/lowcomms-sctp.c
 create mode 100644 fs/dlm/lowcomms-tcp.c
 delete mode 100644 fs/dlm/lowcomms.c

[Cluster-devel] [DLM] Fix compile warning [1/2]

[Steven Whitehouse]

From c80e7c83d56866a735236b45441f024b589f9e88 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Fri, 8 Dec 2006 14:31:12 -0500
Subject: [PATCH] [DLM] fix compile warning

This patch fixes a compile warning in lowcomms-tcp.c indicating that
kmem_cache_t is deprecated.

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 fs/dlm/lowcomms-tcp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/dlm/lowcomms-tcp.c b/fs/dlm/lowcomms-tcp.c
index 8f2791f..9be3a44 100644
--- a/fs/dlm/lowcomms-tcp.c
+++ b/fs/dlm/lowcomms-tcp.c
@@ -143,7 +143,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lowcomms_
 /* An array of pointers to connections, indexed by NODEID */
 static struct connection **connections;
 static DECLARE_MUTEX(connections_lock);
-static kmem_cache_t *con_cache;
+static struct kmem_cache *con_cache;
 static int conn_array_size;
 
 /* List of sockets that have reads pending */
-- 
1.4.1

[Cluster-devel] [GFS2] Fix Kconfig [2/2]

[Steven Whitehouse]

From 1003f06953472ecc34f12d9867670f475a8c1af6 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 12 Dec 2006 10:16:25 +0000
Subject: [PATCH] [GFS2] Fix Kconfig
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Here is a patch to fix up the Kconfig so that we don't land up with
problems when people disable the NET subsystem.  Thanks for all the hints and
suggestions that people have sent me regarding this.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Aleksandr Koltsoff <czr@iki.fi>
Cc: Toralf F?rster <toralf.foerster@gmx.de>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Adrian Bunk <bunk@stusta.de>
Cc: Chris Zubrzycki <chris@middle--earth.org>
Cc: Patrick Caulfield <pcaulfie@redhat.com>
---
 fs/gfs2/Kconfig |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index c0791cb..6a2ffa2 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -34,7 +34,9 @@ config GFS2_FS_LOCKING_NOLOCK
 
 config GFS2_FS_LOCKING_DLM
 	tristate "GFS2 DLM locking module"
-	depends on GFS2_FS
+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
+	select IP_SCTP if DLM_SCTP
+	select CONFIGFS_FS
 	select DLM
 	help
 	Multiple node locking module for GFS2
-- 
1.4.1

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

Please consider pulling the following two compile fixes for GFS2/DLM,

Steve.

------------------------------------------------------------------------------------------
The following changes since commit d1998ef38a13c4e74c69df55ccd38b0440c429b2:
  Ben Collins:
        ib_verbs: Use explicit if-else statements to avoid errors with do-while macros

are found in the git repository at:

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

Patrick Caulfield:
      [DLM] fix compile warning

Steven Whitehouse:
      [GFS2] Fix Kconfig

 fs/dlm/lowcomms-tcp.c |    2 +-
 fs/gfs2/Kconfig       |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

[Cluster-devel] Re: [GFS2] Fix Kconfig [2/2]

[Jan Engelhardt]

On Dec 18 2006 09:57, Steven Whitehouse wrote:
> config GFS2_FS_LOCKING_DLM
> 	tristate "GFS2 DLM locking module"
>-	depends on GFS2_FS
>+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)

What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.


	-`J'
-- 

[Cluster-devel] Re: [GFS2] Fix Kconfig [2/2]

[Robert P. J. Day]

On Mon, 18 Dec 2006, Jan Engelhardt wrote:

>
> On Dec 18 2006 09:57, Steven Whitehouse wrote:
> > config GFS2_FS_LOCKING_DLM
> > 	tristate "GFS2 DLM locking module"
> >-	depends on GFS2_FS
> >+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
>
> What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.

no, we just went through that and russell king is correct -- see the
brief series of posts from earlier this morning during which i made a
fool of myself.  :-P

although, it *is* curious that there appear to be only four places in
the entire source tree that incorporate that type of logical check.
i'm still trying to wrap my head around the rationale for that
particular combination, since it does seem to be rather infrequent and
(at least for me) a little non-intuitive.

rday

[Cluster-devel] Re: [GFS2] Fix Kconfig [2/2]

[Steven Whitehouse]

Hi,

On Mon, 2006-12-18 at 11:50 +0100, Jan Engelhardt wrote:
> On Dec 18 2006 09:57, Steven Whitehouse wrote:
> > config GFS2_FS_LOCKING_DLM
> > 	tristate "GFS2 DLM locking module"
> >-	depends on GFS2_FS
> >+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
> 
> What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.
> 
> 
> 	-`J'

It looks odd, I'll grant you, but see the thread entitled "Re: [PATCH]
Remove logically superfluous comparisons from Kconfig files." and the
answer that Russell King has just given on the same subject where he
says:

>config FOO
>        tristate 'foo'
>        depends on BAR || BAR=n
>
>is not superfluous.  The allowed states for FOO with the above
>construct are (assuming modules are enabled):
>
>        BAR     FOO
>        Y       Y,M,N
>        M       M,N
>        N       Y,M,N

which hopefully explains it a bit better,

Steve.

[Cluster-devel] [GFS2 & DLM] Pull request

[Steven Whitehouse]

Hi,

Please consider pulling the following GFS2 & DLM changes. They are as per
the patches posted recently on lkml, except for three minor changes
(two small bug fixes and a function which should have been static) which
are marked with [*] in the list below. All the other patches have
been in -mm, most of them for a number of weeks. None of the patches touch
any code outside the gfs2 and dlm directories,

Steve.

The following changes since commit 62d0cfcb27cf755cebdc93ca95dabc83608007cd:
  Linus Torvalds (1):
        Linux 2.6.20

are found in the git repository at:

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

Adrian Bunk (4):
      [DLM] fs/dlm/lowcomms-tcp.c: remove 2 functions
      [GFS2] make gfs2_change_nlink_i() static
      [GFS2/DLM] fix GFS2 circular dependency
      [GFS2] make gfs2_writepages() static [*]

David Teigland (18):
      [GFS2] don't try to lockfs after shutdown
      [DLM] fix resend rcom lock
      [DLM] fix old rcom messages
      [DLM] add version check
      [DLM] fix send_args() lvb copying
      [DLM] fix receive_request() lvb copying
      [DLM] fix lost flags in stub replies
      [DLM] change some log_error to log_debug
      [DLM] rename dlm_config_info fields
      [DLM] add config entry to enable log_debug
      [DLM] expose dlm_config_info fields in configfs
      [DLM] fix user unlocking
      [DLM] fix master recovery
      [DLM] saved dlm message can be dropped
      [DLM] can miss clearing resend flag
      [GFS2] increase default lock limit
      [GFS2] make lock_dlm drop_count tunable in sysfs
      [DLM] zero new user lvbs

Eric Sandeen (2):
      [GFS2] use CURRENT_TIME_SEC instead of get_seconds in gfs2
      [GFS2] more CURRENT_TIME_SEC

Patrick Caulfield (7):
      [DLM] Fix schedule() calls
      [DLM] Fix spin lock already unlocked bug
      [DLM] Use workqueues for dlm lowcomms
      [DLM] lowcomms tidy
      [DLM] fix lowcomms receiving
      [DLM] Make sock_sem into a mutex
      [DLM] fix softlockup in dlm_recv

Randy Dunlap (2):
      [GFS2/DLM] use sysfs
      [DLM/GFS2] indent help text

Robert Peterson (1):
      [GFS2] gfs2 knows of directories which it chooses not to display

Russell Cattelan (2):
      [GFS2] BZ 217008 fsfuzzer fix.
      [GFS2] Fix unlink deadlocks

S. Wendy Cheng (2):
      [GFS2] Fix change nlink deadlock
      [GFS2] Fix gfs2_rename deadlock

Steven Whitehouse (18):
      [GFS2] Fix DIO deadlock
      [GFS2] Fail over to readpage for stuffed files
      [GFS2] Fix ordering of page disposal vs. glock_dq
      [GFS2] Add writepages for "data=writeback" mounts
      [GFS2] Clean up/speed up readdir
      [GFS2] Remove max_atomic_write tunable
      [GFS2] Shrink gfs2_inode memory by half
      [GFS2] Remove the "greedy" function from glock.[ch]
      [GFS2] Remove unused go_callback operation
      [GFS2] Remove local exclusive glock mode
      [GFS2] Tidy up glops calls
      [GFS2] Remove queue_empty() function
      [GFS2] Compile fix for glock.c
      [GFS2] Fix typo in glock.c
      [GFS2] Fix recursive locking attempt with NFS
      [GFS2] Fix list corruption in lops.c
      [GFS2] Put back semaphore to avoid umount problem
      [GFS2] Unlock page on prepare_write try lock failure [*]

Wendy Cheng (1):
      [GFS2] nfsd readdirplus assertion failure [*]

 fs/dlm/Kconfig                 |   18 +-
 fs/dlm/config.c                |  154 ++++++++++++++++--
 fs/dlm/config.h                |   17 +-
 fs/dlm/dlm_internal.h          |   20 ++-
 fs/dlm/lock.c                  |   87 +++++++---
 fs/dlm/lockspace.c             |   10 +-
 fs/dlm/lowcomms-sctp.c         |  151 ++++++++---------
 fs/dlm/lowcomms-tcp.c          |  361 +++++++++++-----------------------------
 fs/dlm/midcomms.c              |    4 +-
 fs/dlm/rcom.c                  |   85 ++++++----
 fs/dlm/recover.c               |    8 +-
 fs/dlm/recoverd.c              |   22 ++--
 fs/dlm/user.c                  |    9 +
 fs/dlm/util.c                  |    4 +
 fs/gfs2/Kconfig                |   47 +++---
 fs/gfs2/bmap.c                 |   10 +-
 fs/gfs2/dir.c                  |   25 ++--
 fs/gfs2/dir.h                  |   21 +--
 fs/gfs2/eattr.c                |    8 +-
 fs/gfs2/glock.c                |  316 +++++++++---------------------------
 fs/gfs2/glock.h                |   11 --
 fs/gfs2/glops.c                |  136 +++++----------
 fs/gfs2/incore.h               |   18 +--
 fs/gfs2/inode.c                |   61 ++++----
 fs/gfs2/lm.c                   |    8 +-
 fs/gfs2/locking/dlm/lock_dlm.h |    2 +-
 fs/gfs2/locking/dlm/main.c     |    6 -
 fs/gfs2/locking/dlm/mount.c    |    6 +-
 fs/gfs2/locking/dlm/sysfs.c    |   13 ++
 fs/gfs2/lops.c                 |   14 ++-
 fs/gfs2/ops_address.c          |  134 +++++++++------
 fs/gfs2/ops_dentry.c           |   16 ++-
 fs/gfs2/ops_export.c           |   15 +-
 fs/gfs2/ops_file.c             |   52 +------
 fs/gfs2/ops_inode.c            |   55 +++++--
 fs/gfs2/ops_super.c            |   11 +-
 fs/gfs2/ops_vm.c               |   24 +---
 fs/gfs2/super.c                |   16 +--
 fs/gfs2/sys.c                  |   10 -
 39 files changed, 866 insertions(+), 1119 deletions(-)