From 5bdcf327ddb08a3e38571a40c67dac79e6cefe8b Mon Sep 17 00:00:00 2001
From: Abhijith Das <adas@redhat.com>
Date: Wed, 18 Jul 2012 11:56:59 -0400
Subject: [PATCH] --- yaml --- r: 316747 b: refs/heads/master c:
 294f2ad5a545eb71d397623743ddd8201131bdad h: refs/heads/master i:   316745:
 7dacf0cfd75ea16f7ea35d1bfa89c2592065cfef   316743:
 6fdcad220c0730fd9b2c562305f721700f72be59 v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/rgrp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 29d7fb984de4..dc81e66fa9bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44b8db13860a449b5d85afdc65da654ce56da678
+refs/heads/master: 294f2ad5a545eb71d397623743ddd8201131bdad
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index e53d0a1c234f..fb7079263ea7 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -1276,6 +1276,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, u32 requested)
 			/* fall through */
 		case GLR_TRYFAILED:
 			rgd = gfs2_rgrpd_get_next(rgd);
+			rgd = rgd ? : begin; /* if NULL, wrap */
 			if (rgd != begin) /* If we didn't wrap */
 				break;