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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: rename causes kernel Oops
  GFS2: BUG in gfs2_adjust_quota
  GFS2: Fix kernel NULL pointer dereference by dlm_astd
  GFS2: recovery stuck on transaction lock
  GFS2: O_TRUNC not working on stuffed files across cluster

1 files changed, 3 insertions, 5 deletions

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 49667d68769e..b256d6f24288 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -694,10 +694,8 @@ get_a_page:
                 if (!buffer_mapped(bh))
                         goto unlock_out;
                 /* If it's a newly allocated disk block for quota, zero it */
-                if (buffer_new(bh)) {
-                        memset(bh->b_data, 0, bh->b_size);
-                        set_buffer_uptodate(bh);
-                }
+                if (buffer_new(bh))
+                        zero_user(page, pos - blocksize, bh->b_size);
         }
 
         if (PageUptodate(page))
@@ -723,7 +721,7 @@ get_a_page:
 
         /* If quota straddles page boundary, we need to update the rest of the
          * quota at the beginning of the next page */
-        if (offset != 0) { /* first page, offset is closer to PAGE_CACHE_SIZE */
+        if ((offset + sizeof(struct gfs2_quota)) > PAGE_CACHE_SIZE) {
                 ptr = ptr + nbytes;
                 nbytes = sizeof(struct gfs2_quota) - nbytes;
                 offset = 0;