Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / fs / ext3 / ext3_jbd.c

diff --git a/fs/ext3/ext3_jbd.c b/fs/ext3/ext3_jbd.c
index e1f91fd26a93aa9aaf6ba7544fd7e2809bad7c96..d401f148d74d2bc87e72a46e53b34c6b4fc3a27a 100644 (file)
--- a/fs/ext3/ext3_jbd.c
+++ b/fs/ext3/ext3_jbd.c
@@ -9,7 +9,7 @@ int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
 {
        int err = journal_get_undo_access(handle, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }
 
@@ -18,7 +18,7 @@ int __ext3_journal_get_write_access(const char *where, handle_t *handle,
 {
        int err = journal_get_write_access(handle, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }
 
@@ -27,7 +27,7 @@ int __ext3_journal_forget(const char *where, handle_t *handle,
 {
        int err = journal_forget(handle, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }
 
@@ -36,7 +36,7 @@ int __ext3_journal_revoke(const char *where, handle_t *handle,
 {
        int err = journal_revoke(handle, blocknr, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }
 
@@ -45,7 +45,7 @@ int __ext3_journal_get_create_access(const char *where,
 {
        int err = journal_get_create_access(handle, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }
 
@@ -54,6 +54,6 @@ int __ext3_journal_dirty_metadata(const char *where,
 {
        int err = journal_dirty_metadata(handle, bh);
        if (err)
-               ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
+               ext3_journal_abort_handle(where, __func__, bh, handle,err);
        return err;
 }