Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[safe/jmp/linux-2.6] / fs / ext4 / ext4_jbd2.c

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 913f857..53d2764 100644 (file)
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -34,38 +34,6 @@ int __ext4_journal_get_write_access(const char *where, handle_t *handle,
        return err;
 }
 
-int __ext4_journal_forget(const char *where, handle_t *handle,
-                               struct buffer_head *bh)
-{
-       int err = 0;
-
-       if (ext4_handle_valid(handle)) {
-               err = jbd2_journal_forget(handle, bh);
-               if (err)
-                       ext4_journal_abort_handle(where, __func__, bh,
-                                                 handle, err);
-       }
-       else
-               bforget(bh);
-       return err;
-}
-
-int __ext4_journal_revoke(const char *where, handle_t *handle,
-                               ext4_fsblk_t blocknr, struct buffer_head *bh)
-{
-       int err = 0;
-
-       if (ext4_handle_valid(handle)) {
-               err = jbd2_journal_revoke(handle, blocknr, bh);
-               if (err)
-                       ext4_journal_abort_handle(where, __func__, bh,
-                                                 handle, err);
-       }
-       else
-               bforget(bh);
-       return err;
-}
-
 /*
  * The ext4 forget function must perform a revoke if we are freeing data
  * which has been journaled.  Metadata (eg. indirect blocks) must be
@@ -94,6 +62,12 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata,
                  bh, is_metadata, inode->i_mode,
                  test_opt(inode->i_sb, DATA_FLAGS));
 
+       /* In the no journal case, we can just do a bforget and return */
+       if (!ext4_handle_valid(handle)) {
+               bforget(bh);
+               return 0;
+       }
+
        /* Never use the revoke function if we are doing full data
         * journaling: there is no need to, and a V1 superblock won't
         * support it.  Otherwise, only skip the revoke on un-journaled
@@ -103,7 +77,11 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata,
            (!is_metadata && !ext4_should_journal_data(inode))) {
                if (bh) {
                        BUFFER_TRACE(bh, "call jbd2_journal_forget");
-                       return __ext4_journal_forget(where, handle, bh);
+                       err = jbd2_journal_forget(handle, bh);
+                       if (err)
+                               ext4_journal_abort_handle(where, __func__, bh,
+                                                         handle, err);
+                       return err;
                }
                return 0;
        }
@@ -111,11 +89,13 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata,
        /*
         * data!=journal && (is_metadata || should_journal_data(inode))
         */
-       BUFFER_TRACE(bh, "call ext4_journal_revoke");
-       err = __ext4_journal_revoke(where, handle, blocknr, bh);
-       if (err)
+       BUFFER_TRACE(bh, "call jbd2_journal_revoke");
+       err = jbd2_journal_revoke(handle, blocknr, bh);
+       if (err) {
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
                ext4_abort(inode->i_sb, __func__,
                           "error %d when attempting revoke", err);
+       }
        BUFFER_TRACE(bh, "exit");
        return err;
 }
@@ -145,14 +125,14 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle,
                        ext4_journal_abort_handle(where, __func__, bh,
                                                  handle, err);
        } else {
-               if (inode && bh)
+               if (inode)
                        mark_buffer_dirty_inode(bh, inode);
                else
                        mark_buffer_dirty(bh);
                if (inode && inode_needs_sync(inode)) {
                        sync_dirty_buffer(bh);
                        if (buffer_req(bh) && !buffer_uptodate(bh)) {
-                               ext4_error(inode->i_sb, __func__,
+                               ext4_error(inode->i_sb,
                                           "IO error syncing inode, "
                                           "inode=%lu, block=%llu",
                                           inode->i_ino,