From 0644999976b35d238f8de5666e97e9bd18533735 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Sat, 24 Jun 2006 15:42:21 -0400
Subject: [PATCH] --- yaml --- r: 38727 b: refs/heads/master c:
 af18ddb8864b096e3ed4732e2d4b21c956dcfe3a h: refs/heads/master i:   38725:
 3ca8312222c1dfc97e430ca21ffafcee628809f1   38723:
 92f92cdb0c3607ecc443b17707f40c348fab274f   38719:
 6b1cf44aae1722b90857cc83af68278fd044c39b v: v3

---
 [refs]                    | 2 +-
 trunk/fs/gfs2/glock.c     | 8 +++++---
 trunk/fs/gfs2/ops_inode.c | 6 ++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0556e976f868..ed29b11fd4e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a53311d4d9e1cde15aebc2048847ea19fb33ac3a
+refs/heads/master: af18ddb8864b096e3ed4732e2d4b21c956dcfe3a
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 35bac90878a5..dbeb4ad836bd 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -416,7 +416,7 @@ void gfs2_holder_uninit(struct gfs2_holder *gh)
  * @gl: the glock
  * @state: the state we're requesting
  * @flags: the modifier flags
- * @gfp_flags: __GFP_NOFAIL
+ * @gfp_flags:
  *
  * Figure out how big an impact this function has.  Either:
  * 1) Replace it with a cache of structures hanging off the struct gfs2_sbd
@@ -720,6 +720,7 @@ static void gfs2_glmutex_unlock(struct gfs2_glock *gl)
  * @gl: the glock
  * @state: the state the caller wants us to change to
  *
+ * Note: This may fail sliently if we are out of memory.
  */
 
 static void handle_callback(struct gfs2_glock *gl, unsigned int state)
@@ -744,8 +745,9 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state)
 	} else {
 		spin_unlock(&gl->gl_spin);
 
-		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY,
-					 GFP_KERNEL | __GFP_NOFAIL),
+		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_KERNEL);
+		if (!new_gh)
+			return;
 		set_bit(HIF_DEMOTE, &new_gh->gh_iflags);
 		set_bit(HIF_DEALLOC, &new_gh->gh_iflags);
 
diff --git a/trunk/fs/gfs2/ops_inode.c b/trunk/fs/gfs2/ops_inode.c
index 5d5ebbcba534..8895baafc640 100644
--- a/trunk/fs/gfs2/ops_inode.c
+++ b/trunk/fs/gfs2/ops_inode.c
@@ -962,10 +962,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
 	brelse(dibh);
 
 	if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
-		gfs2_quota_change(ip, -ip->i_di.di_blocks,
-				 ouid, ogid);
-		gfs2_quota_change(ip, ip->i_di.di_blocks,
-				 nuid, ngid);
+		gfs2_quota_change(ip, -ip->i_di.di_blocks, ouid, ogid);
+		gfs2_quota_change(ip, ip->i_di.di_blocks, nuid, ngid);
 	}
 
  out_end_trans: