ext4: skip conversion of uninit extents after direct IO if there isn't any

[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 c75384b..6a94099 100644 (file)
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -7,53 +7,103 @@
 int __ext4_journal_get_undo_access(const char *where, handle_t *handle,
                                struct buffer_head *bh)
 {
-       int err = jbd2_journal_get_undo_access(handle, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       int err = 0;
+
+       if (ext4_handle_valid(handle)) {
+               err = jbd2_journal_get_undo_access(handle, bh);
+               if (err)
+                       ext4_journal_abort_handle(where, __func__, bh,
+                                                 handle, err);
+       }
        return err;
 }
 
 int __ext4_journal_get_write_access(const char *where, handle_t *handle,
                                struct buffer_head *bh)
 {
-       int err = jbd2_journal_get_write_access(handle, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       int err = 0;
+
+       if (ext4_handle_valid(handle)) {
+               err = jbd2_journal_get_write_access(handle, bh);
+               if (err)
+                       ext4_journal_abort_handle(where, __func__, bh,
+                                                 handle, err);
+       }
        return err;
 }
 
 int __ext4_journal_forget(const char *where, handle_t *handle,
                                struct buffer_head *bh)
 {
-       int err = jbd2_journal_forget(handle, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       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 = jbd2_journal_revoke(handle, blocknr, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       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;
 }
 
 int __ext4_journal_get_create_access(const char *where,
                                handle_t *handle, struct buffer_head *bh)
 {
-       int err = jbd2_journal_get_create_access(handle, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       int err = 0;
+
+       if (ext4_handle_valid(handle)) {
+               err = jbd2_journal_get_create_access(handle, bh);
+               if (err)
+                       ext4_journal_abort_handle(where, __func__, bh,
+                                                 handle, err);
+       }
        return err;
 }
 
-int __ext4_journal_dirty_metadata(const char *where,
-                               handle_t *handle, struct buffer_head *bh)
+int __ext4_handle_dirty_metadata(const char *where, handle_t *handle,
+                                struct inode *inode, struct buffer_head *bh)
 {
-       int err = jbd2_journal_dirty_metadata(handle, bh);
-       if (err)
-               ext4_journal_abort_handle(where, __func__, bh, handle, err);
+       int err = 0;
+
+       if (ext4_handle_valid(handle)) {
+               err = jbd2_journal_dirty_metadata(handle, bh);
+               if (err)
+                       ext4_journal_abort_handle(where, __func__, bh,
+                                                 handle, err);
+       } else {
+               if (inode && bh)
+                       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__,
+                                          "IO error syncing inode, "
+                                          "inode=%lu, block=%llu",
+                                          inode->i_ino,
+                                          (unsigned long long) bh->b_blocknr);
+                               err = -EIO;
+                       }
+               }
+       }
        return err;
 }