From cb7ada8267c0b18c0e42e5a04b9dfc1989127e49 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Tue, 6 Aug 2002 18:57:52 +0400 Subject: [PATCH] reiserfs_fs.h, namei.c, bitmap.c: fix __FUNCTION__ usage, since its use as string literals is deprecated now. --- fs/reiserfs/bitmap.c | 4 ++-- fs/reiserfs/namei.c | 6 +++--- include/linux/reiserfs_fs.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index e6283fc8587a..50ce0a8f654b 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c @@ -689,7 +689,7 @@ void reiserfs_discard_prealloc (struct reiserfs_transaction_handle *th, struct reiserfs_inode_info *ei = REISERFS_I(inode); #ifdef CONFIG_REISERFS_CHECK if (ei->i_prealloc_count < 0) - reiserfs_warning("zam-4001:" __FUNCTION__ ": inode has negative prealloc blocks count.\n"); + reiserfs_warning("zam-4001:%s inode has negative prealloc blocks count.\n", __FUNCTION__); #endif if (ei->i_prealloc_count > 0) { __discard_prealloc(th, ei); @@ -705,7 +705,7 @@ void reiserfs_discard_all_prealloc (struct reiserfs_transaction_handle *th) ei = list_entry(plist->next, struct reiserfs_inode_info, i_prealloc_list); #ifdef CONFIG_REISERFS_CHECK if (!ei->i_prealloc_count) { - reiserfs_warning("zam-4001:" __FUNCTION__ ": inode is in prealloc list but has no preallocated blocks.\n"); + reiserfs_warning("zam-4001:%s: inode is in prealloc list but has no preallocated blocks.\n", __FUNCTION__); } #endif __discard_prealloc(th, ei); diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index a8c4b14bde9a..6ff54b618291 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c @@ -296,7 +296,7 @@ static int reiserfs_find_entry (struct inode * dir, const char * name, int namel while (1) { retval = search_by_entry_key (dir->i_sb, &key_to_search, path_to_entry, de); if (retval == IO_ERROR) { - reiserfs_warning ("zam-7001: io error in " __FUNCTION__ "\n"); + reiserfs_warning ("zam-7001: io error in %s\n", __FUNCTION__); return IO_ERROR; } @@ -468,8 +468,8 @@ static int reiserfs_add_entry (struct reiserfs_transaction_handle *th, struct in } if (retval != NAME_FOUND) { - reiserfs_warning ("zam-7002:" __FUNCTION__ ": \"reiserfs_find_entry\" has returned" - " unexpected value (%d)\n", retval); + reiserfs_warning ("zam-7002:%s: \"reiserfs_find_entry\" has returned" + " unexpected value (%d)\n", __FUNCTION__, retval); } return -EEXIST; diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 9ddf1e2f0a20..b3a2a5a1a78c 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -79,9 +79,9 @@ /** always check a condition and panic if it's false. */ #define RASSERT( cond, format, args... ) \ if( !( cond ) ) \ - reiserfs_panic( 0, "reiserfs[%i]: assertion " #cond " failed at " \ - __FILE__ ":%i:" __FUNCTION__ ": " format "\n", \ - in_interrupt() ? -1 : current -> pid, __LINE__ , ##args ) + reiserfs_panic( 0, "reiserfs[%i]: assertion " #cond " failed at " \ + __FILE__ ":%i:%s: " format "\n", \ + in_interrupt() ? -1 : current -> pid, __LINE__ , __FUNCTION__ , ##args ) #if defined( CONFIG_REISERFS_CHECK ) #define RFALSE( cond, format, args... ) RASSERT( !( cond ), format, ##args ) -- 2.39.5