1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 07a9b52a2654..35d4f6342fac 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -61,7 +61,7 @@ extern u8 journal_enable_debug;
         do {                                                            \
                 if ((n) <= journal_enable_debug) {                      \
                         printk (KERN_DEBUG "(%s, %d): %s: ",            \
-                                __FILE__, __LINE__, __FUNCTION__);      \
+                                __FILE__, __LINE__, __func__);  \
                         printk (f, ## a);                               \
                 }                                                       \
         } while (0)
@@ -816,6 +816,9 @@ struct journal_s
 #define JFS_FLUSHED     0x008   /* The journal superblock has been flushed */
 #define JFS_LOADED      0x010   /* The journal superblock has been loaded */
 #define JFS_BARRIER     0x020   /* Use IDE barriers */
+#define JFS_ABORT_ON_SYNCDATA_ERR       0x040  /* Abort the journal on file
+                                                * data write error in ordered
+                                                * mode */
 
 /*
  * Function declarations for the journaling transaction and buffer
@@ -984,7 +987,7 @@ extern int	cleanup_journal_tail(journal_t *);
 
 #define jbd_ENOSYS() \
 do {                                                                       \
-        printk (KERN_ERR "JBD unimplemented function %s\n", __FUNCTION__); \
+        printk (KERN_ERR "JBD unimplemented function %s\n", __func__); \
         current->state = TASK_UNINTERRUPTIBLE;                             \
         schedule();                                                        \
 } while (1)