diff --git a/[refs] b/[refs]
index 89a749fa5c75..92aa53f26867 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41db1ab9bed189cb904f7b0e145c3c6030c094c6
+refs/heads/master: 500242ac6152b8f20903f043a86e6fdd51478845
diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index 45d9171e078b..b97178e7d397 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/fs/gfs2/quota.c
@@ -744,7 +744,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
 		i_size_write(inode, size);
 	inode->i_mtime = inode->i_atime = CURRENT_TIME;
 	mark_inode_dirty(inode);
-	return err;
+	return 0;
 
 unlock_out:
 	unlock_page(page);