ext4: move headers out of include/linux

[linux-2.6-omap-h63xx.git] / fs / ext4 / ext4_jbd2.c

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index d6afe4e273403147c091cdc7d3807b90d6f6083e..c75384b34f2c7e1f587818cafc301a5d6aae5b1e 100644 (file)
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -2,14 +2,14 @@
  * Interface between ext4 and JBD
  */
 
-#include <linux/ext4_jbd2.h>
+#include "ext4_jbd2.h"
 
 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, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }
 
@@ -18,7 +18,7 @@ int __ext4_journal_get_write_access(const char *where, handle_t *handle,
 {
        int err = jbd2_journal_get_write_access(handle, bh);
        if (err)
-               ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }
 
@@ -27,7 +27,7 @@ int __ext4_journal_forget(const char *where, handle_t *handle,
 {
        int err = jbd2_journal_forget(handle, bh);
        if (err)
-               ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }
 
@@ -36,7 +36,7 @@ int __ext4_journal_revoke(const char *where, handle_t *handle,
 {
        int err = jbd2_journal_revoke(handle, blocknr, bh);
        if (err)
-               ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }
 
@@ -45,7 +45,7 @@ int __ext4_journal_get_create_access(const char *where,
 {
        int err = jbd2_journal_get_create_access(handle, bh);
        if (err)
-               ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }
 
@@ -54,6 +54,6 @@ int __ext4_journal_dirty_metadata(const char *where,
 {
        int err = jbd2_journal_dirty_metadata(handle, bh);
        if (err)
-               ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext4_journal_abort_handle(where, __func__, bh, handle, err);
        return err;
 }