ocfs2: Fix ocfs2_read_quota_block() error handling.

ocfs2_bread() has become ocfs2_read_virt_blocks(), with a prototype to
match ocfs2_read_blocks().  The quota code, converting from
ocfs2_bread(), wraps the call to ocfs2_read_virt_blocks() in
ocfs2_read_quota_block().  Unfortunately, the prototype of
ocfs2_read_quota_block() matches the old prototype of ocfs2_bread().

The problem is that ocfs2_bread() returned the buffer head, and callers
assumed that a NULL pointer was indicative of error.  It wasn't.  This
is why ocfs2_bread() took an int*err argument as well.

The new prototype of ocfs2_read_virt_blocks() avoids this error handling
confusion.  Let's change ocfs2_read_quota_block() to match.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

1 files changed, 20 insertions, 14 deletions

diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 10ecb33298d8..2bdcddd3f1c4 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -87,16 +87,21 @@ struct qtree_fmt_operations ocfs2_global_ops = {
         .is_id = ocfs2_global_is_id,
 };
 
-struct buffer_head *ocfs2_read_quota_block(struct inode *inode,
-                                           int block, int *err)
+int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
+                           struct buffer_head **bh)
 {
-        struct buffer_head *tmp = NULL;
+        int rc = 0;
+        struct buffer_head *tmp = *bh;
 
-        *err = ocfs2_read_virt_blocks(inode, block, 1, &tmp, 0, NULL);
-        if (*err)
-                mlog_errno(*err);
+        rc = ocfs2_read_virt_blocks(inode, v_block, 1, &tmp, 0, NULL);
+        if (rc)
+                mlog_errno(rc);
+
+        /* If ocfs2_read_virt_blocks() got us a new bh, pass it up. */
+        if (!rc && !*bh)
+                *bh = tmp;
 
-        return tmp;
+        return rc;
 }
 
 static struct buffer_head *ocfs2_get_quota_block(struct inode *inode,
@@ -143,8 +148,9 @@ ssize_t ocfs2_quota_read(struct super_block *sb, int type, char *data,
         toread = len;
         while (toread > 0) {
                 tocopy = min((size_t)(sb->s_blocksize - offset), toread);
-                bh = ocfs2_read_quota_block(gqinode, blk, &err);
-                if (!bh) {
+                bh = NULL;
+                err = ocfs2_read_quota_block(gqinode, blk, &bh);
+                if (err) {
                         mlog_errno(err);
                         return err;
                 }
@@ -169,7 +175,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
         int offset = off & (sb->s_blocksize - 1);
         sector_t blk = off >> sb->s_blocksize_bits;
         int err = 0, new = 0;
-        struct buffer_head *bh;
+        struct buffer_head *bh = NULL;
         handle_t *handle = journal_current_handle();
 
         if (!handle) {
@@ -200,13 +206,13 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
         /* Not rewriting whole block? */
         if ((offset || len < sb->s_blocksize - OCFS2_QBLK_RESERVED_SPACE) &&
             !new) {
-                bh = ocfs2_read_quota_block(gqinode, blk, &err);
-                if (!bh) {
+                err = ocfs2_read_quota_block(gqinode, blk, &bh);
+                if (err) {
                         mlog_errno(err);
                         return err;
                 }
                 err = ocfs2_journal_access(handle, gqinode, bh,
-                                                OCFS2_JOURNAL_ACCESS_WRITE);
+                                           OCFS2_JOURNAL_ACCESS_WRITE);
         } else {
                 bh = ocfs2_get_quota_block(gqinode, blk, &err);
                 if (!bh) {
@@ -214,7 +220,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
                         return err;
                 }
                 err = ocfs2_journal_access(handle, gqinode, bh,
-                                                OCFS2_JOURNAL_ACCESS_CREATE);
+                                           OCFS2_JOURNAL_ACCESS_CREATE);
         }
         if (err < 0) {
                 brelse(bh);