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 recovery stuck bug (try #2)
  GFS2: Fix typo in stuffed file data copy handling
  Revert "GFS2: recovery stuck on transaction lock"
  GFS2: Make "try" lock not try quite so hard
  GFS2: remove dependency on __GFP_NOFAIL
  GFS2: Simplify gfs2_write_alloc_required
  GFS2: Wait for journal id on mount if not specified on mount command line
  GFS2: Use nobh_writepage

1 files changed, 3 insertions, 12 deletions

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 8f02d3db8f42..8bb643cb2658 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -787,15 +787,9 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
                 goto out;
 
         for (x = 0; x < num_qd; x++) {
-                int alloc_required;
-
                 offset = qd2offset(qda[x]);
-                error = gfs2_write_alloc_required(ip, offset,
-                                                  sizeof(struct gfs2_quota),
-                                                  &alloc_required);
-                if (error)
-                        goto out_gunlock;
-                if (alloc_required)
+                if (gfs2_write_alloc_required(ip, offset,
+                                              sizeof(struct gfs2_quota)))
                         nalloc++;
         }
 
@@ -1584,10 +1578,7 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id,
                 goto out_i;
 
         offset = qd2offset(qd);
-        error = gfs2_write_alloc_required(ip, offset, sizeof(struct gfs2_quota),
-                                          &alloc_required);
-        if (error)
-                goto out_i;
+        alloc_required = gfs2_write_alloc_required(ip, offset, sizeof(struct gfs2_quota));
         if (alloc_required) {
                 al = gfs2_alloc_get(ip);
                 if (al == NULL)