[Cluster-devel] [GFS2/DLM] Bug fixes [0/12]

[Cluster-devel] [GFS2/DLM] Bug fixes [0/12]

[Steven Whitehouse]

Hi,

Following this message are 12 bugs fixes and minor clean ups from the
GFS2 -fixes git tree. They are all pretty small, most are just a few
lines long.

I've only just pushed the patches, so it may take a little while for
kernel.org's mirrors to pick them up. They are all in the -nmw tree as
well, of course,

Steve.

[Cluster-devel] [GFS2] fix locking mistake [1/12]

[Steven Whitehouse]

From 2e95b6653bb69c893e6ee1b42b537939c1ea2b9c Mon Sep 17 00:00:00 2001
From: Josef Whiter <jwhiter@redhat.com>
Date: Tue, 20 Feb 2007 00:03:29 -0500
Subject: [PATCH] [GFS2] fix locking mistake

This patch fixes a locking mistake in the quota code, we do a mutex_lock instead
of a mutex_unlock.

Signed-off-by: Josef Whiter <jwhiter@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index d0db881..c186857 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -279,7 +279,7 @@ static int bh_get(struct gfs2_quota_data *qd)
 		(bh->b_data + sizeof(struct gfs2_meta_header) +
 		 offset * sizeof(struct gfs2_quota_change));
 
-	mutex_lock(&sdp->sd_quota_mutex);
+	mutex_unlock(&sdp->sd_quota_mutex);
 
 	return 0;
 
-- 
1.4.4.2

[Cluster-devel] [GFS2] add newline to printk message [2/12]

[Steven Whitehouse]

From d5a6751b32c79680da90eaa76919ffe6e5b8a94f Mon Sep 17 00:00:00 2001
From: Richard Fearn <richardfearn@gmail.com>
Date: Sat, 17 Feb 2007 17:29:15 +0000
Subject: [PATCH] [GFS2] add newline to printk message

Patch for the 2.6.20 stable tree that adds a missing newline to one of
the printk messages in fs/gfs2/ops_fstype.c.

Signed-off-by: Richard Fearn <richardfearn@gmail.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index ee80b8a..ee54cb6 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -840,7 +840,7 @@ static struct super_block* get_gfs2_sb(const char *dev_name)
 	}
 
 	printk(KERN_WARNING "GFS2: Unrecognized block device or "
-	       "mount point %s", dev_name);
+	       "mount point %s\n", dev_name);
 
 free_nd:
 	path_release(&nd);
-- 
1.4.4.2

[Cluster-devel] [GFS2] NFS filehandle check [3/12]

[Steven Whitehouse]

From a7d2b2bdc9a0b55d5b08e15756c7e65c48c4bca5 Mon Sep 17 00:00:00 2001
From: Wendy Cheng <wcheng@redhat.com>
Date: Fri, 23 Feb 2007 00:21:17 -0500
Subject: [PATCH] [GFS2] NFS filehandle check

File handle checking error found in '07 NFS connectathon. The fh_type
and fh_len are not necessarily identical. Some of the client machines
could fail mount with stale filehandle without this patch.

Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
index 1de05b6..aad9183 100644
--- a/fs/gfs2/ops_export.c
+++ b/fs/gfs2/ops_export.c
@@ -38,14 +38,11 @@ static struct dentry *gfs2_decode_fh(struct super_block *sb,
 	struct gfs2_fh_obj fh_obj;
 	struct gfs2_inum_host *this, parent;
 
-	if (fh_type != fh_len)
-		return NULL;
-
 	this 		= &fh_obj.this;
 	fh_obj.imode 	= DT_UNKNOWN;
 	memset(&parent, 0, sizeof(struct gfs2_inum));
 
-	switch (fh_type) {
+	switch (fh_len) {
 	case GFS2_LARGE_FH_SIZE:
 		parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
 		parent.no_formal_ino |= be32_to_cpu(fh[5]);
-- 
1.4.4.2

[Cluster-devel] [GFS2] fix hangup when multiple processes are trying to write to the same file [4/12]

[Steven Whitehouse]

From a13cbe375303585fec1425135ed54adb62be41fc Mon Sep 17 00:00:00 2001
From: Josef Whiter <jwhiter@redhat.com>
Date: Fri, 23 Feb 2007 12:49:51 -0500
Subject: [PATCH] [GFS2] fix hangup when multiple processes are trying to write to the same file

This fixes a problem I encountered while running bonnie++.  When you have one
thread that opens a file and starts to write to it, and then another thread that
tries to open and write to the same file, the second thread will loop forever
trying to grab the inode lock for that inode.  Basically we come in through
generic_buffered_file_write, which calls gfs2_prepare_write, which then attempts
to grab the glock.  Because we don't own the lock, gfs2_prepare_write gets
GLR_TRYFAILED, which returns AOP_TRUNCATED_PAGE to generic_buffered_file_write.
At this point generic_buffered_file_write loops around again and immediately
retries the prepare_write.  This means that the second process never gets off of
the processor in order to allow the process that holds the lock to finish its
work and let go of the lock.  This patch makes gfs2_glock_nq schedule() if it
gets back a GLR_TRYFAILED, which resolves this problem.

Signed-off-by: Josef Whiter <jwhiter@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 56e3359..b3b7e84 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -266,9 +266,11 @@ skip_lock:
 out:
 	return error;
 out_unlock:
-	if (error == GLR_TRYFAILED)
-		error = AOP_TRUNCATED_PAGE;
 	unlock_page(page);
+	if (error == GLR_TRYFAILED) {
+		error = AOP_TRUNCATED_PAGE;
+		yield();
+	}
 	if (do_unlock)
 		gfs2_holder_uninit(&gh);
 	goto out;
@@ -364,6 +366,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
 		if (error == GLR_TRYFAILED) {
 			unlock_page(page);
 			error = AOP_TRUNCATED_PAGE;
+			yield();
 		}
 		goto out_uninit;
 	}
-- 
1.4.4.2

[Cluster-devel] [DLM] fs/dlm/user.c should #include "user.h" [5/12]

[Steven Whitehouse]

From 84c6e8cd359adc34d21e40efcafe09297510b3c8 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 26 Feb 2007 00:18:42 +0100
Subject: [PATCH] [DLM] fs/dlm/user.c should #include "user.h"

Every file should include the headers containing the prototypes for
it's global functions.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 40db61d..3870150 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -22,6 +22,7 @@
 #include "lockspace.h"
 #include "lock.h"
 #include "lvb_table.h"
+#include "user.h"
 
 static const char *name_prefix="dlm";
 static struct miscdevice ctl_device;
-- 
1.4.4.2

[Cluster-devel] [GFS2] pass formal ino in do_filldir_main [6/12]

[Steven Whitehouse]

From fb0d3bce8e88cca4abb26076f778f64edcaf19aa Mon Sep 17 00:00:00 2001
From: Wendy Cheng <wcheng@redhat.com>
Date: Wed, 28 Feb 2007 11:24:25 -0500
Subject: [PATCH] [GFS2] pass formal ino in do_filldir_main

ok, the following is the minimum changes to get NFSD going before we
settle down this issue .. would appreciate this in the tree so other NFS
related works can get done in parallel.

Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0d6831a..902dd81 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -61,13 +61,13 @@ static int iget_set(struct inode *inode, void *opaque)
 
 struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum)
 {
-	return ilookup5(sb, (unsigned long)inum->no_formal_ino,
+	return ilookup5(sb, (unsigned long)inum->no_addr,
 			iget_test, inum);
 }
 
 static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum_host *inum)
 {
-	return iget5_locked(sb, (unsigned long)inum->no_formal_ino,
+	return iget5_locked(sb, (unsigned long)inum->no_addr,
 		     iget_test, iget_set, inum);
 }
 
-- 
1.4.4.2

[Cluster-devel] [GFS2] Fix bz 230143, incorrect flushing of rgrps [7/12]

[Steven Whitehouse]

From cad5b9392754910ee7dbe551eb004010a864c882 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 28 Feb 2007 14:03:00 +0000
Subject: [PATCH] [GFS2] Fix bz 230143, incorrect flushing of rgrps

The below patch fixes a problem where we were not flushing rgrps
correctly. It only occurred in the specific case that a callback was
received for an rgrp which was dirty and when a journal log flush had
not already resulted in the rgrp being flushed anyway. This fixes Red
Hat bz 230143,

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 46af553..4221110 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -459,6 +459,8 @@ const struct gfs2_glock_operations gfs2_inode_glops = {
 };
 
 const struct gfs2_glock_operations gfs2_rgrp_glops = {
+	.go_xmote_th = meta_go_sync,
+	.go_drop_th = meta_go_sync,
 	.go_inval = meta_go_inval,
 	.go_demote_ok = rgrp_go_demote_ok,
 	.go_lock = rgrp_go_lock,
-- 
1.4.4.2

[Cluster-devel] [GFS2] Fix bz 229831, lookup returns wrong inode [8/12]

[Steven Whitehouse]

From 1be3867955731b5cb2dc14060cc46f0882e87873 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 1 Mar 2007 10:00:53 +0000
Subject: [PATCH] [GFS2] Fix bz 229831, lookup returns wrong inode

The following patch fixes Red Hat bz 229831. Without this patch its
possible for the wrong inode to be returned in certain cases. It is a
pretty unusual event, so that its taken some time to track down. Thanks
and due to Josef Whiter who did a lot of the testing required to thrack
this down and fix it.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 902dd81..df0b8b3 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -43,7 +43,8 @@ static int iget_test(struct inode *inode, void *opaque)
 	struct gfs2_inode *ip = GFS2_I(inode);
 	struct gfs2_inum_host *inum = opaque;
 
-	if (ip->i_num.no_addr == inum->no_addr)
+	if (ip->i_num.no_addr == inum->no_addr &&
+	    inode->i_private != NULL)
 		return 1;
 
 	return 0;
-- 
1.4.4.2

[Cluster-devel] [GFS2] Remove unused variable [9/12]

[Steven Whitehouse]

From 04b159b132c0d8e92dae8c72f134fd5b13b43deb Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 1 Mar 2007 11:14:44 +0000
Subject: [PATCH] [GFS2] Remove unused variable

Remove an unused variable.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 12c80fd..0b2b545 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -416,7 +416,6 @@ struct gfs2_tune {
 	unsigned int gt_stall_secs; /* Detects trouble! */
 	unsigned int gt_complain_secs;
 	unsigned int gt_reclaim_limit; /* Max num of glocks in reclaim list */
-	unsigned int gt_entries_per_readdir;
 	unsigned int gt_statfs_quantum;
 	unsigned int gt_statfs_slow;
 };
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 70f424f..4fdda97 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -76,7 +76,6 @@ void gfs2_tune_init(struct gfs2_tune *gt)
 	gt->gt_stall_secs = 600;
 	gt->gt_complain_secs = 10;
 	gt->gt_reclaim_limit = 5000;
-	gt->gt_entries_per_readdir = 32;
 	gt->gt_statfs_quantum = 30;
 	gt->gt_statfs_slow = 0;
 }
-- 
1.4.4.2

[Cluster-devel] [GFS2] go_drop_bh is never used, so remove it [10/12]

[Steven Whitehouse]

From 631c42e170564108423fa4073531db159f2523ea Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 1 Mar 2007 10:36:32 +0000
Subject: [PATCH] [GFS2] go_drop_bh is never used, so remove it

The ->go_drop_bh function is never used, so this removes it and the single
caller,

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 6618c11..8597fde 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -953,9 +953,6 @@ static void drop_bh(struct gfs2_glock *gl, unsigned int ret)
 		spin_unlock(&gl->gl_spin);
 	}
 
-	if (glops->go_drop_bh)
-		glops->go_drop_bh(gl);
-
 	spin_lock(&gl->gl_spin);
 	gl->gl_req_gh = NULL;
 	gl->gl_req_bh = NULL;
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 0b2b545..49f0dbf 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -104,7 +104,6 @@ struct gfs2_glock_operations {
 	void (*go_xmote_th) (struct gfs2_glock *gl);
 	void (*go_xmote_bh) (struct gfs2_glock *gl);
 	void (*go_drop_th) (struct gfs2_glock *gl);
-	void (*go_drop_bh) (struct gfs2_glock *gl);
 	void (*go_inval) (struct gfs2_glock *gl, int flags);
 	int (*go_demote_ok) (struct gfs2_glock *gl);
 	int (*go_lock) (struct gfs2_holder *gh);
-- 
1.4.4.2

[Cluster-devel] [GFS2] build fix [11/12]

[Steven Whitehouse]

From 95d97b7dd7d7a7a13d11a38b3ecb64849d2e5086 Mon Sep 17 00:00:00 2001
From: akpm@linux-foundation.org <akpm@linux-foundation.org>
Date: Mon, 5 Mar 2007 23:10:39 -0800
Subject: [PATCH] [GFS2] build fix

fs/gfs2/glock.c:2198: error: 'THIS_MODULE' undeclared here (not in a function)

Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 8597fde..12accb0 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -20,6 +20,7 @@
 #include <linux/list.h>
 #include <linux/lm_interface.h>
 #include <linux/wait.h>
+#include <linux/module.h>
 #include <linux/rwsem.h>
 #include <asm/uaccess.h>
 
-- 
1.4.4.2

[Cluster-devel] [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed [12/12]

[Steven Whitehouse]

From c3f49bc209b28d2b5f82b78baaa827eb3a4d1891 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 7 Mar 2007 09:06:48 +0000
Subject: [PATCH] [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed

The following removes an incorrect assertion from the GFS2 glops code. This
fixes Red Hat bz 229873. Thanks to Abhijith Das for testing the patch
and confirming the fix.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Abhijith Das <adas@redhat.com>

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 4221110..39c8ae2 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -245,7 +245,6 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)
 
 	if (ip && S_ISREG(ip->i_inode.i_mode)) {
 		truncate_inode_pages(ip->i_inode.i_mapping, 0);
-		gfs2_assert_withdraw(GFS2_SB(&ip->i_inode), !ip->i_inode.i_mapping->nrpages);
 		clear_bit(GIF_PAGED, &ip->i_flags);
 	}
 }
-- 
1.4.4.2

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

[Steven Whitehouse]

Hi,

Please consider pulling the following GFS2 & DLM bug fixes and trivial clean ups. 
They are all relatively small in size,

Steve.

The following changes since commit 08e15e81a40e3241ce93b4a43886f3abda184aa6:
  Linus Torvalds (1):
        Linux 2.6.21-rc3

are found in the git repository at:

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

Adrian Bunk (1):
      [DLM] fs/dlm/user.c should #include "user.h"

akpm at linux-foundation.org (1):
      [GFS2] build fix

Josef Whiter (2):
      [GFS2] fix locking mistake
      [GFS2] fix hangup when multiple processes are trying to write to the same file

Richard Fearn (1):
      [GFS2] add newline to printk message

Steven Whitehouse (5):
      [GFS2] Fix bz 230143, incorrect flushing of rgrps
      [GFS2] Fix bz 229831, lookup returns wrong inode
      [GFS2] Remove unused variable
      [GFS2] go_drop_bh is never used, so remove it
      [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed

Wendy Cheng (2):
      [GFS2] NFS filehandle check
      [GFS2] pass formal ino in do_filldir_main

 fs/dlm/user.c         |    1 +
 fs/gfs2/glock.c       |    4 +---
 fs/gfs2/glops.c       |    3 ++-
 fs/gfs2/incore.h      |    2 --
 fs/gfs2/inode.c       |    7 ++++---
 fs/gfs2/ops_address.c |    7 +++++--
 fs/gfs2/ops_export.c  |    5 +----
 fs/gfs2/ops_fstype.c  |    2 +-
 fs/gfs2/quota.c       |    2 +-
 fs/gfs2/super.c       |    1 -
 10 files changed, 16 insertions(+), 18 deletions(-)

[Cluster-devel] [GFS2] Patches for the current merge window [0/34]

[Steven Whitehouse]

Hi,

Following this email are the 34 patches for GFS2 for this merge window.
They are mostly cleanups and bug fixes again, although there are one or
two new features. The edited highlights are:

 - Merge lowcomms code in DLM so that the protocol is run-time
selectable rather than compile time
 - Add support for GFS2 "lockdump" debugging feature
 - Various bug fixes & cleanups

Note that the code thats added commented out, in patch 11, (just a
couple of lines in all) and changed again in patch 24 is uncommented in
patch 34 since the patch upon which it depends (sprint_symbol) has just
been merged into Linus' tree from -mm yesterday,

Steve.

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

[Steven Whitehouse]

Hi,

Please consider pulling the following patches from the GFS2/DLM -nmw git tree,

Steve.



The following changes since commit dc87c3985e9b442c60994308a96f887579addc39:
  Linus Torvalds (1):
        libata: honour host controllers that want just one host

are found in the git repository at:

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

Adrian Bunk (1):
      [DLM] fs/dlm/ast.c should #include "ast.h"

Benjamin Marzinski (2):
      [GFS2] Fix log entry list corruption
      [GFS2] flush the log if a transaction can't allocate space

David Teigland (8):
      [DLM] overlapping cancel and unlock
      [GFS2] use log_error before LM_OUT_ERROR
      [DLM] split create_message function
      [DLM] add orphan purging code (1/2)
      [DLM] interface for purge (2/2)
      [DLM] change lkid format
      [DLM] fix mode munging
      [DLM] lowcomms style

Josef Bacik (2):
      [DLM] Fix dlm_lowcoms_stop hang
      [GFS2] use lib/parser for parsing mount options

Josef Whiter (2):
      [GFS2] fix bz 231369, gfs2 will oops if you specify an invalid mount option
      [GFS2] Fix bz 231380, unlock page before dequeing glocks in gfs2_commit_write

Patrick Caulfield (6):
      [DLM] Fix uninitialised variable in receiving
      [DLM] Don't delete misc device if lockspace removal fails
      [DLM] fix coverity-spotted stupidity
      [DLM] Remove redundant assignment
      [DLM] Consolidate transport protocols
      [DLM] Lowcomms nodeid range & initialisation fixes

Robert Peterson (4):
      [GFS2] Add gfs2_tool lockdump support to gfs2 (bz 228540)
      [GFS2] Red Hat bz 228540: owner references
      [GFS2] bz 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump)
      [GFS2] lockdump improvements

Steven Whitehouse (8):
      [GFS2] Fix bz 224480 and cleanup glock demotion code
      [GFS2] Fix a bug on i386 due to evaluation order
      [GFS2] Speed up lock_dlm's locking (move sprintf)
      [GFS2] Set drop_count to 0 (off) by default
      [GFS2] Fix bz 234168 (ignoring rgrp flags)
      [GFS2] Patch to detect corrupt number of dir entries in leaf and/or inode blocks
      [GFS2] Patch to fix mmap of stuffed files
      [GFS2] Uncomment sprintf_symbol calling code

akpm at linux-foundation.org (1):
      [GFS2] printk warning fixes

 fs/dlm/Kconfig                 |   31 +-
 fs/dlm/Makefile                |    6 +-
 fs/dlm/ast.c                   |    1 +
 fs/dlm/config.c                |   10 +-
 fs/dlm/config.h                |    3 +-
 fs/dlm/dlm_internal.h          |   11 +-
 fs/dlm/lock.c                  |  955 ++++++++++++++++++++------
 fs/dlm/lock.h                  |    2 +
 fs/dlm/lockspace.c             |    4 +-
 fs/dlm/lowcomms-sctp.c         | 1210 --------------------------------
 fs/dlm/lowcomms-tcp.c          | 1007 ---------------------------
 fs/dlm/lowcomms.c              | 1475 ++++++++++++++++++++++++++++++++++++++++
 fs/dlm/user.c                  |  163 +++--
 fs/gfs2/dir.c                  |   38 +-
 fs/gfs2/glock.c                |  619 ++++++++++-------
 fs/gfs2/glock.h                |    8 +-
 fs/gfs2/incore.h               |   14 +-
 fs/gfs2/locking/dlm/lock.c     |   14 +-
 fs/gfs2/locking/dlm/lock_dlm.h |    3 +-
 fs/gfs2/lops.c                 |   20 +-
 fs/gfs2/main.c                 |    4 +-
 fs/gfs2/mount.c                |  239 ++++---
 fs/gfs2/ops_address.c          |   21 +-
 fs/gfs2/ops_fstype.c           |    4 +
 fs/gfs2/ops_super.c            |   28 +-
 fs/gfs2/rgrp.c                 |   12 +-
 include/linux/dlm_device.h     |    9 +-
 27 files changed, 3005 insertions(+), 2906 deletions(-)
 delete mode 100644 fs/dlm/lowcomms-sctp.c
 delete mode 100644 fs/dlm/lowcomms-tcp.c
 create mode 100644 fs/dlm/lowcomms.c

[Cluster-devel] [GFS2/DLM] Some small bug fixes

[Steven Whitehouse]

Hi,

The following patches are the bug fix patches in the current GFS2 -nmw
git tree which I've extracted into the -fixes tree since they are relatively
small and self contained. They are relative to 2.6.22-rc5,

Steve.

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

[Steven Whitehouse]

Hi,

Please consider pulling the following patches from the GFS2 fixes git tree,

Steve.

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

The following changes since commit 188e1f81ba31af1b65a2f3611df4c670b092bbac:
  Linus Torvalds (1):
        Linux 2.6.22-rc5

are found in the git repository at:

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

Benjamin Marzinski (1):
      [GFS2] flush the glock completely in inode_go_sync

Josef Bacik (1):
      [DLM] keep dlm from panicing when traversing rsb list in debugfs

Nate Diller (1):
      [GFS2] use zero_user_page

Satyam Sharma (1):
      [DLM] fix a couple of races

 fs/dlm/config.c   |   15 +++++++++++----
 fs/dlm/debug_fs.c |    9 ++++++++-
 fs/gfs2/bmap.c    |    6 +-----
 fs/gfs2/glops.c   |    2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

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

[Steven Whitehouse]

Hi,

On Mon, 2007-06-18 at 16:13 +0100, Steven Whitehouse wrote:
> Hi,
> 
> Please consider pulling the following patches from the GFS2 fixes git tree,
> 
> Steve.
> 
Dave Teigland has just asked me not to push the fourth patch in the
series until later, so there are now only three patches in the set.
Sorry about that. An updated change log is below:

Steve.

--------------------------------------------------
The following changes since commit 188e1f81ba31af1b65a2f3611df4c670b092bbac:
  Linus Torvalds (1):
        Linux 2.6.22-rc5

are found in the git repository at:

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

Benjamin Marzinski (1):
      [GFS2] flush the glock completely in inode_go_sync

Nate Diller (1):
      [GFS2] use zero_user_page

Satyam Sharma (1):
      [DLM] fix a couple of races

 fs/dlm/config.c |   15 +++++++++++----
 fs/gfs2/bmap.c  |    6 +-----
 fs/gfs2/glops.c |    2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

[Cluster-devel] [GFS2/DLM] Pre-pull Patch Posting

[swhiteho]

Hi,

This is the current set of patches from the GFS2/DLM -nmw git tree which
are pending inclusion in the current merge window. There are quite a
few mainly as I was a bit lazy in pushing some of the smaller bug fixes
before.

There are a couple of things in -mm which depend upon changes in the
current GFS2 tree, so my plan is to request a merge very shortly to
leave time for those other items to be merged later.

All the changes here only relate to GFS2 and/or DLM, there are no
changes which affect any of the core code. Most of the patches are
in fatc bug fixes and/or cleanups. The only "new" feature is GFS2 is
the nanosecond timestamps feature.

Steve.

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

[Steven Whitehouse]

Hi,

Please consider pulling the following changes from the GFS2/DLM -nmw git
tree,

Steve.

--------------------------------------------------------------------
The following changes since commit 7dcca30a32aadb0520417521b0c44f42d09fe05c:
  Linus Torvalds (1):
        Linux 2.6.22

are found in the git repository at:

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

Abhijith Das (4):
      [GFS2] Quotas non-functional - fix bug
      [GFS2] Quotas non-functional - fix another bug
      [GFS2] Fix deallocation issues
      [GFS2] System won't suspend with GFS2 file system mounted

Benjamin Marzinski (2):
      [GFS2] flush the glock completely in inode_go_sync
      [GFS2] fix jdata issues

Bob Peterson (1):
      [GFS2] remounting w/o acl option leaves acls enabled

David Teigland (15):
      [DLM] block scand during recovery [1/6]
      [DLM] add lock timeouts and warnings [2/6]
      [DLM] dlm_device interface changes [3/6]
      [DLM] cancel in conversion deadlock [4/6]
      [DLM] fix new_lockspace error exit [5/6]
      [DLM] wait for config check during join [6/6]
      [DLM] fix compile breakage
      [DLM] timeout fixes
      [DLM] canceling deadlocked lock
      [DLM] dumping master locks
      [DLM] show default protocol
      [GFS2] set plock owner in GETLK info
      [GFS2] return conflicts for GETLK
      [DLM] don't require FS flag on all nodes
      [DLM] dump more lock values

Fabio Massimo Di Nitto (1):
      [GFS2] latest gfs2-nmw headers break userland build

Josef Bacik (2):
      [DLM] keep dlm from panicing when traversing rsb list in debugfs
      [DLM] fix reference counting

Nate Diller (1):
      [GFS2] use zero_user_page

Patrick Caulfield (3):
      [DLM] fix socket shutdown
      [DLM] variable allocation
      [DLM] Telnet to port 21064 can stop all lockspaces

Robert Peterson (7):
      [GFS2] kernel changes to support new gfs2_grow command
      [GFS2] Kernel changes to support new gfs2_grow command (part 2)
      [GFS2] Addendum patch 2 for gfs2_grow
      [GFS2] Can't mount GFS2 file system on AoE device
      [GFS2] Journaled file write/unstuff bug
      [GFS2] assertion failure after writing to journaled file, umount
      [GFS2] Addendum to the journaled file/unmount patch

S. Wendy Cheng (1):
      [GFS2] Fix gfs2_block_truncate_page err return

Satyam Sharma (1):
      [DLM] fix a couple of races

Steven Whitehouse (13):
      [GFS2] Reduce size of struct gdlm_lock
      [GFS2] Clean up inode number handling
      [DLM] Compile fix
      [GFS2] Make the log reserved blocks depend on block size
      [GFS2] Fix sign problem in quota/statfs and cleanup _host structures
      [GFS2] Add nanosecond timestamp feature
      [GFS2] Fix typo in rename of directories
      [GFS2] Fix bug in error path of inode
      [GFS2] Recovery for lost unlinked inodes
      [GFS2] Remove bogus '\0' in rgrp.c
      [GFS2] Use zero_user_page() in stuffed_readpage()
      [GFS2] Simplify multiple glock aquisition
      [GFS2] Small fixes to logging code

Wendy Cheng (3):
      [GFS2] inode size inconsistency
      [GFS2] Obtaining no_formal_ino from directory entry
      [GFS2] Remove i_mode passing from NFS File Handle

akpm at linux-foundation.org (2):
      [GFS2] gfs2_lookupi() uninitialised var fix
      [GFS2] git-gfs2-nmw-build-fix

 fs/dlm/Makefile                |    1 +
 fs/dlm/config.c                |   25 ++-
 fs/dlm/config.h                |    1 +
 fs/dlm/debug_fs.c              |  186 +++++++++++++++-
 fs/dlm/dlm_internal.h          |   17 ++
 fs/dlm/lock.c                  |  470 +++++++++++++++++++++++++++++++---------
 fs/dlm/lock.h                  |   13 +-
 fs/dlm/lockspace.c             |   86 ++++++--
 fs/dlm/lowcomms.c              |   23 ++-
 fs/dlm/main.c                  |   11 +-
 fs/dlm/member.c                |   11 +-
 fs/dlm/netlink.c               |  153 +++++++++++++
 fs/dlm/rcom.c                  |   13 +-
 fs/dlm/recoverd.c              |    4 +-
 fs/dlm/user.c                  |  129 +++++++++---
 fs/gfs2/Makefile               |    2 +-
 fs/gfs2/bmap.c                 |   23 +-
 fs/gfs2/daemon.c               |   11 +
 fs/gfs2/dir.c                  |   69 +++++--
 fs/gfs2/dir.h                  |    9 +-
 fs/gfs2/eattr.c                |   14 +-
 fs/gfs2/glock.c                |  123 +++++------
 fs/gfs2/glock.h                |    1 +
 fs/gfs2/glops.c                |    2 +-
 fs/gfs2/incore.h               |   81 ++++++-
 fs/gfs2/inode.c                |  288 +++++++++++++++++-------
 fs/gfs2/inode.h                |   30 ++-
 fs/gfs2/locking/dlm/lock.c     |   11 +-
 fs/gfs2/locking/dlm/lock_dlm.h |    2 +-
 fs/gfs2/locking/dlm/mount.c    |    2 +-
 fs/gfs2/locking/dlm/plock.c    |    8 +-
 fs/gfs2/locking/dlm/thread.c   |   11 +-
 fs/gfs2/log.c                  |  129 +++++++++---
 fs/gfs2/lops.c                 |   49 ++--
 fs/gfs2/lops.h                 |   23 ++
 fs/gfs2/meta_io.c              |    8 +-
 fs/gfs2/meta_io.h              |    2 +-
 fs/gfs2/mount.c                |   25 +-
 fs/gfs2/ondisk.c               |  251 ---------------------
 fs/gfs2/ops_address.c          |   69 +++++-
 fs/gfs2/ops_address.h          |    2 +-
 fs/gfs2/ops_dentry.c           |   24 +--
 fs/gfs2/ops_export.c           |   63 +++---
 fs/gfs2/ops_export.h           |   22 --
 fs/gfs2/ops_file.c             |    4 +-
 fs/gfs2/ops_fstype.c           |   33 ++--
 fs/gfs2/ops_fstype.h           |    1 +
 fs/gfs2/ops_inode.c            |   30 ++--
 fs/gfs2/ops_super.c            |    8 +-
 fs/gfs2/ops_vm.c               |    2 +-
 fs/gfs2/quota.c                |   57 +++++-
 fs/gfs2/recovery.c             |   22 ++-
 fs/gfs2/rgrp.c                 |  377 ++++++++++++++++++++++++--------
 fs/gfs2/rgrp.h                 |    1 +
 fs/gfs2/super.c                |   79 +++++--
 fs/gfs2/super.h                |    2 +-
 fs/gfs2/util.c                 |    6 +-
 include/linux/Kbuild           |    1 +
 include/linux/dlm.h            |   14 +-
 include/linux/dlm_device.h     |   22 ++-
 include/linux/dlm_netlink.h    |   56 +++++
 include/linux/gfs2_ondisk.h    |  142 +-----------
 62 files changed, 2247 insertions(+), 1107 deletions(-)
 create mode 100644 fs/dlm/netlink.c
 delete mode 100644 fs/gfs2/ondisk.c
 delete mode 100644 fs/gfs2/ops_export.h
 create mode 100644 include/linux/dlm_netlink.h

[Cluster-devel] [PATCH] [DLM] Clear othercon pointers when a connection is closed

[swhiteho]

From: Patrick Caulfield <pcaulfie@redhat.com>

This patch clears the othercon pointer and frees the memory when a connnection
is closed. This could cause a small memory leak when nodes leave the cluster.

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index dd36273..d15fd5f 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -327,6 +327,8 @@ static void close_connection(struct connection *con, bool and_other)
 	if (con->othercon && and_other) {
 		/* Will only re-enter once. */
 		close_connection(con->othercon, false);
+		kmem_cache_free(con_cache, con->othercon);
+		con->othercon = NULL;
 	}
 	if (con->rx_page) {
 		__free_page(con->rx_page);
-- 
1.5.1.2

[Cluster-devel] [GFS2/DLM] [0/12] Pre pull request patch posting

[Steven Whitehouse]

Hi,

This set of patches are from the GFS2 -fixes tree. There are further
fixes currently in the -nmw git tree, but these are the ones which have
been there some time and are known to fix important issues, so these are
the ones which I'll send a pull request for shortly,

Steve.

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

[Steven Whitehouse]

Hi,

Please consider pulling the following bug fixes from the GFS2/DLM -fixes git tree,

Steve.

The following changes since commit 39d3520c92cf7a28c07229ca00cc35a1e8026c77:
  Linus Torvalds (1):
        Linux 2.6.23-rc3

are found in the git repository at:

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

Bob Peterson (2):
      [GFS2] soft lockup detected in databuf_lo_before_commit
      [GFS2] soft lockup in rgblk_search

David Teigland (2):
      [DLM] fix NULL ls usage
      [DLM] fix basts for granted PR waiting CW

Jesper Juhl (1):
      [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero

Patrick Caulfield (3):
      [DLM] Clear othercon pointers when a connection is closed
      [DLM] zero unused parts of sockaddr_storage
      [DLM] More othercon fixes

Steven Whitehouse (4):
      [GFS2] Fix incorrect return code in rgrp.c
      [GFS2] Fix incorrect error path in prepare_write()
      [GFS2] Fix setting of inherit jdata attr
      [GFS2] Revert remounting w/o acl option leaves acls enabled

 fs/dlm/lock.c         |   69 +++++++++++++++++++++++++++++++++++++++----------
 fs/dlm/lowcomms.c     |   24 +++++++++++-----
 fs/dlm/member.c       |    4 ++-
 fs/dlm/rcom.c         |    7 ++---
 fs/gfs2/lops.c        |    6 +++-
 fs/gfs2/mount.c       |   25 +++++++++--------
 fs/gfs2/ops_address.c |    3 +-
 fs/gfs2/ops_file.c    |   29 ++++++++++++--------
 fs/gfs2/rgrp.c        |   16 ++++++++---
 9 files changed, 124 insertions(+), 59 deletions(-)

[Cluster-devel] [GFS2/DLM] Pre-pull patch posting

[swhiteho]

Hi,

Since it seems that another merge window will probably be opening shortly
this is a posting of the current content of the GFS2/DLM -nmw git tree.

There are no new features this time, its all fixes and cleanups. I have
a few patches that I'm holding back which I'm intending to start off
the new -nmw git tree with after this merge, those include:

 o Patch to use page_mkwrite() on page faults (and thus allow us to
   use the filemap_fault() function rather than having a special
   GFS2 version of this like we do at the moment)
 o Patch to clean up gfs2_internal_read() as requested by Christoph
   Hellwig
 o Patches to separate the GFS2 aops into three separate operations
   structures (for writeback, ordered & jdata) as per ext3 which is
   waiting for the merge of Nick Piggin's AOP changes so that I don't
   land up creating a merge conflict.

Anyhow, back to what is in this set of patches... the major area of
change is the journalling code where there has been a lot of clean
up. Other than that, its mostly fixes for individual bugs and clean
ups that other people have sent to me,

Steve.

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

[Steven Whitehouse]

Hi,

There have been no changes since I posted the patches for review a few
days ago. Please consider pulling the following changes from the
GFS2/DLM -nmw git tree:

The following changes since commit bbf25010f1a6b761914430f5fca081ec8c7accd1:
  Linus Torvalds (1):
        Linux 2.6.23

are found in the git repository at:

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

Abhijith Das (5):
      [GFS2] Force unstuff of hidden quota inode
      [GFS2] Fix quota do_list operation hang
      [GFS2] Wendy's dump lockname in hex & fix glock dump
      [GFS2] panic after can't parse mount arguments
      [GFS2] flocks from same process trip kernel BUG at fs/gfs2/glock.c:1118!

Benjamin Marzinski (3):
      [GFS2] Add NULL entry to token table
      [GFS2] delay glock demote for a minimum hold time
      [GFS2] Alternate gfs2_iget to avoid looking up inodes being freed

Bob Peterson (9):
      [GFS2] Move some code inside the log lock
      [GFS2] Revert part of earlier log.c changes
      [GFS2] Prevent infinite loop in try_rgrp_unlink()
      [GFS2] Detach buf data during in-place writeback
      [GFS2] invalid metadata block - REVISED
      [GFS2] Ensure journal file cache is flushed after recovery
      [GFS2] Patch to protect sd_log_num_jdata
      [GFS2] Fix ordering of dirty/journal for ordered buffer unstuffing
      [GFS2] GFS2: chmod hung - fix race in thread creation

David Teigland (1):
      [DLM] block dlm_recv in recovery transition

Denis Cheng (7):
      [GFS2] use an temp variable to reduce a spin_unlock
      [GFS2] mark struct *_operations const
      [GFS2] use the declaration of gfs2_dops in the header file instead
      [GFS2] use list_for_each_entry instead
      [GFS2] unneeded typecast
      [GFS2] better code for translating characters
      [GFS2] fixed a NULL pointer assignment BUG

Jesper Juhl (1):
      [GFS2] Clean up duplicate includes in fs/gfs2/

Josef Whiter (1):
      [GFS2] Fix calculation of demote state

Patrick Caulfield (3):
      [DLM] Fix lowcomms socket closing
      [DLM] Make dlm_sendd cond_resched more
      [DLM] don't overwrite castparam if it's NULL

Steve French (1):
      [GFS2] GFS2 not checking pointer on create when running under nfsd

Steven Whitehouse (16):
      [GFS2] Fix two races relating to glock callbacks
      [GFS2] Fix an oops in glock dumping
      [GFS2] Reduce number of gfs2_scand processes to one
      [GFS2] Clean up invalidatepage/releasepage
      [GFS2] Add a missing gfs2_trans_add_bh()
      [GFS2] Correct lock ordering in unlink
      [GFS2] Introduce gfs2_remove_from_ail
      [GFS2] Don't mark jdata dirty in gfs2_unstuffer_page()
      [GFS2] Move pin/unpin into lops.c, clean up locking
      [GFS2] Clean up ordered write code
      [GFS2] Replace revoke structure with bufdata structure
      [GFS2] Use slab operations for all gfs2_bufdata allocations
      [GFS2] Clean up gfs2_trans_add_revoke()
      [GFS2] Clean up journaled data writing
      [GFS2] Don't try to remove buffers that don't exist
      [GFS2] Get superblock a different way

Wendy Cheng (4):
      [GFS2] Reduce truncate IO traffic
      [GFS2] fix inode meta data corruption
      [GFS2] Move inode deletion out of blocking_cb
      [GFS2] Data corruption fix

 fs/dlm/dlm_internal.h          |    1 +
 fs/dlm/lock.c                  |  142 +++++++-----
 fs/dlm/lock.h                  |    3 +-
 fs/dlm/lockspace.c             |    1 +
 fs/dlm/lowcomms.c              |   23 +--
 fs/dlm/member.c                |   41 +++--
 fs/dlm/midcomms.c              |   17 +--
 fs/dlm/rcom.c                  |   36 +---
 fs/dlm/rcom.h                  |    5 +-
 fs/dlm/recoverd.c              |   11 +-
 fs/dlm/requestqueue.c          |   58 ++---
 fs/dlm/requestqueue.h          |    4 +-
 fs/gfs2/bmap.c                 |   35 +++-
 fs/gfs2/daemon.c               |   24 --
 fs/gfs2/daemon.h               |    1 -
 fs/gfs2/dir.c                  |    3 +-
 fs/gfs2/eaops.c                |    8 +-
 fs/gfs2/eaops.h                |    4 +-
 fs/gfs2/glock.c                |  293 ++++++++++++++++---------
 fs/gfs2/glock.h                |    5 +-
 fs/gfs2/glops.c                |   24 +--
 fs/gfs2/incore.h               |   31 ++--
 fs/gfs2/inode.c                |   78 ++++++-
 fs/gfs2/inode.h                |    3 +-
 fs/gfs2/locking/dlm/lock_dlm.h |    1 -
 fs/gfs2/locking/dlm/plock.c    |   11 +-
 fs/gfs2/locking/dlm/thread.c   |   20 +-
 fs/gfs2/locking/nolock/main.c  |    1 -
 fs/gfs2/log.c                  |  230 +++++++++++++-------
 fs/gfs2/log.h                  |    2 +
 fs/gfs2/lops.c                 |  470 ++++++++++++++++++++--------------------
 fs/gfs2/main.c                 |    3 +
 fs/gfs2/meta_io.c              |  136 +++---------
 fs/gfs2/meta_io.h              |    6 +-
 fs/gfs2/mount.c                |    5 +-
 fs/gfs2/ops_address.c          |  146 ++++---------
 fs/gfs2/ops_export.c           |    2 +-
 fs/gfs2/ops_file.c             |   13 +-
 fs/gfs2/ops_fstype.c           |   40 ++--
 fs/gfs2/ops_inode.c            |   38 +++-
 fs/gfs2/ops_super.c            |   14 +-
 fs/gfs2/quota.c                |   13 +
 fs/gfs2/recovery.c             |    2 +-
 fs/gfs2/rgrp.c                 |   39 ++--
 fs/gfs2/super.c                |    1 -
 fs/gfs2/sys.c                  |    2 -
 fs/gfs2/trans.c                |   22 +-
 fs/gfs2/trans.h                |    2 +-
 include/linux/gfs2_ondisk.h    |   30 +++-
 49 files changed, 1139 insertions(+), 961 deletions(-)