Commit 8e24eea7 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds

fs: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 530b6412
...@@ -75,7 +75,7 @@ extern unsigned int adfs_map_free(struct super_block *sb); ...@@ -75,7 +75,7 @@ extern unsigned int adfs_map_free(struct super_block *sb);
/* Misc */ /* Misc */
void __adfs_error(struct super_block *sb, const char *function, void __adfs_error(struct super_block *sb, const char *function,
const char *fmt, ...); const char *fmt, ...);
#define adfs_error(sb, fmt...) __adfs_error(sb, __FUNCTION__, fmt) #define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)
/* super.c */ /* super.c */
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/* #define DEBUG */ /* #define DEBUG */
#ifdef DEBUG #ifdef DEBUG
#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __FUNCTION__ , ##args); } while(0) #define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __func__ , ##args); } while(0)
#else #else
#define DPRINTK(fmt,args...) do {} while(0) #define DPRINTK(fmt,args...) do {} while(0)
#endif #endif
......
...@@ -42,7 +42,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) ...@@ -42,7 +42,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode)
#define printf(format, args...) \ #define printf(format, args...) \
printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args) printk(KERN_ERR "BFS-fs: %s(): " format, __func__, ## args)
/* inode.c */ /* inode.c */
extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino); extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino);
......
...@@ -1101,7 +1101,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size) ...@@ -1101,7 +1101,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size)
printk(KERN_ERR "%s: requested out-of-range block %llu for " printk(KERN_ERR "%s: requested out-of-range block %llu for "
"device %s\n", "device %s\n",
__FUNCTION__, (unsigned long long)block, __func__, (unsigned long long)block,
bdevname(bdev, b)); bdevname(bdev, b));
return -EIO; return -EIO;
} }
......
...@@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp ...@@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp
goto out; goto out;
} }
pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
__FUNCTION__, count, *ppos, buffer->page); __func__, count, *ppos, buffer->page);
retval = simple_read_from_buffer(buf, count, ppos, buffer->page, retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
buffer->count); buffer->count);
out: out:
......
...@@ -92,7 +92,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -92,7 +92,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
root = d_alloc_root(inode); root = d_alloc_root(inode);
if (!root) { if (!root) {
pr_debug("%s: could not get root dentry!\n",__FUNCTION__); pr_debug("%s: could not get root dentry!\n",__func__);
iput(inode); iput(inode);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -210,13 +210,13 @@ static int configfs_get_target_path(struct config_item * item, struct config_ite ...@@ -210,13 +210,13 @@ static int configfs_get_target_path(struct config_item * item, struct config_ite
if (size > PATH_MAX) if (size > PATH_MAX)
return -ENAMETOOLONG; return -ENAMETOOLONG;
pr_debug("%s: depth = %d, size = %d\n", __FUNCTION__, depth, size); pr_debug("%s: depth = %d, size = %d\n", __func__, depth, size);
for (s = path; depth--; s += 3) for (s = path; depth--; s += 3)
strcpy(s,"../"); strcpy(s,"../");
fill_item_path(target, path, size); fill_item_path(target, path, size);
pr_debug("%s: path = '%s'\n", __FUNCTION__, path); pr_debug("%s: path = '%s'\n", __func__, path);
return 0; return 0;
} }
......
...@@ -200,7 +200,7 @@ int __init dlm_lockspace_init(void) ...@@ -200,7 +200,7 @@ int __init dlm_lockspace_init(void)
dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj); dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);
if (!dlm_kset) { if (!dlm_kset) {
printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); printk(KERN_WARNING "%s: can not create kset\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;
......
...@@ -150,12 +150,12 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) ...@@ -150,12 +150,12 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)
if (IS_ERR(ppd)) { if (IS_ERR(ppd)) {
err = PTR_ERR(ppd); err = PTR_ERR(ppd);
dprintk("%s: get_parent of %ld failed, err %d\n", dprintk("%s: get_parent of %ld failed, err %d\n",
__FUNCTION__, pd->d_inode->i_ino, err); __func__, pd->d_inode->i_ino, err);
dput(pd); dput(pd);
break; break;
} }
dprintk("%s: find name of %lu in %lu\n", __FUNCTION__, dprintk("%s: find name of %lu in %lu\n", __func__,
pd->d_inode->i_ino, ppd->d_inode->i_ino); pd->d_inode->i_ino, ppd->d_inode->i_ino);
err = exportfs_get_name(mnt, ppd, nbuf, pd); err = exportfs_get_name(mnt, ppd, nbuf, pd);
if (err) { if (err) {
...@@ -168,14 +168,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) ...@@ -168,14 +168,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)
continue; continue;
break; break;
} }
dprintk("%s: found name: %s\n", __FUNCTION__, nbuf); dprintk("%s: found name: %s\n", __func__, nbuf);
mutex_lock(&ppd->d_inode->i_mutex); mutex_lock(&ppd->d_inode->i_mutex);
npd = lookup_one_len(nbuf, ppd, strlen(nbuf)); npd = lookup_one_len(nbuf, ppd, strlen(nbuf));
mutex_unlock(&ppd->d_inode->i_mutex); mutex_unlock(&ppd->d_inode->i_mutex);
if (IS_ERR(npd)) { if (IS_ERR(npd)) {
err = PTR_ERR(npd); err = PTR_ERR(npd);
dprintk("%s: lookup failed: %d\n", dprintk("%s: lookup failed: %d\n",
__FUNCTION__, err); __func__, err);
dput(ppd); dput(ppd);
dput(pd); dput(pd);
break; break;
...@@ -188,7 +188,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) ...@@ -188,7 +188,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)
if (npd == pd) if (npd == pd)
noprogress = 0; noprogress = 0;
else else
printk("%s: npd != pd\n", __FUNCTION__); printk("%s: npd != pd\n", __func__);
dput(npd); dput(npd);
dput(ppd); dput(ppd);
if (IS_ROOT(pd)) { if (IS_ROOT(pd)) {
......
...@@ -242,7 +242,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus) ...@@ -242,7 +242,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
/* prevent the infinite loop of cluster chain */ /* prevent the infinite loop of cluster chain */
if (*fclus > limit) { if (*fclus > limit) {
fat_fs_panic(sb, "%s: detected the cluster chain loop" fat_fs_panic(sb, "%s: detected the cluster chain loop"
" (i_pos %lld)", __FUNCTION__, " (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos); MSDOS_I(inode)->i_pos);
nr = -EIO; nr = -EIO;
goto out; goto out;
...@@ -253,7 +253,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus) ...@@ -253,7 +253,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
goto out; goto out;
else if (nr == FAT_ENT_FREE) { else if (nr == FAT_ENT_FREE) {
fat_fs_panic(sb, "%s: invalid cluster chain" fat_fs_panic(sb, "%s: invalid cluster chain"
" (i_pos %lld)", __FUNCTION__, " (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos); MSDOS_I(inode)->i_pos);
nr = -EIO; nr = -EIO;
goto out; goto out;
...@@ -286,7 +286,7 @@ static int fat_bmap_cluster(struct inode *inode, int cluster) ...@@ -286,7 +286,7 @@ static int fat_bmap_cluster(struct inode *inode, int cluster)
return ret; return ret;
else if (ret == FAT_ENT_EOF) { else if (ret == FAT_ENT_EOF) {
fat_fs_panic(sb, "%s: request beyond EOF (i_pos %lld)", fat_fs_panic(sb, "%s: request beyond EOF (i_pos %lld)",
__FUNCTION__, MSDOS_I(inode)->i_pos); __func__, MSDOS_I(inode)->i_pos);
return -EIO; return -EIO;
} }
return dclus; return dclus;
......
...@@ -546,7 +546,7 @@ int fat_free_clusters(struct inode *inode, int cluster) ...@@ -546,7 +546,7 @@ int fat_free_clusters(struct inode *inode, int cluster)
goto error; goto error;
} else if (cluster == FAT_ENT_FREE) { } else if (cluster == FAT_ENT_FREE) {
fat_fs_panic(sb, "%s: deleting FAT entry beyond EOF", fat_fs_panic(sb, "%s: deleting FAT entry beyond EOF",
__FUNCTION__); __func__);
err = -EIO; err = -EIO;
goto error; goto error;
} }
......
...@@ -208,7 +208,7 @@ static int fat_free(struct inode *inode, int skip) ...@@ -208,7 +208,7 @@ static int fat_free(struct inode *inode, int skip)
} else if (ret == FAT_ENT_FREE) { } else if (ret == FAT_ENT_FREE) {
fat_fs_panic(sb, fat_fs_panic(sb,
"%s: invalid cluster chain (i_pos %lld)", "%s: invalid cluster chain (i_pos %lld)",
__FUNCTION__, MSDOS_I(inode)->i_pos); __func__, MSDOS_I(inode)->i_pos);
ret = -EIO; ret = -EIO;
} else if (ret > 0) { } else if (ret > 0) {
err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, wait); err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, wait);
......
...@@ -212,7 +212,7 @@ int gdlm_sysfs_init(void) ...@@ -212,7 +212,7 @@ int gdlm_sysfs_init(void)
{ {
gdlm_kset = kset_create_and_add("lock_dlm", NULL, kernel_kobj); gdlm_kset = kset_create_and_add("lock_dlm", NULL, kernel_kobj);
if (!gdlm_kset) { if (!gdlm_kset) {
printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); printk(KERN_WARNING "%s: can not create kset\n", __func__);
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;
......
...@@ -41,7 +41,7 @@ int gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion, ...@@ -41,7 +41,7 @@ int gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,
#define gfs2_assert_withdraw(sdp, assertion) \ #define gfs2_assert_withdraw(sdp, assertion) \
((likely(assertion)) ? 0 : gfs2_assert_withdraw_i((sdp), #assertion, \ ((likely(assertion)) ? 0 : gfs2_assert_withdraw_i((sdp), #assertion, \
__FUNCTION__, __FILE__, __LINE__)) __func__, __FILE__, __LINE__))
int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
...@@ -49,28 +49,28 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion, ...@@ -49,28 +49,28 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
#define gfs2_assert_warn(sdp, assertion) \ #define gfs2_assert_warn(sdp, assertion) \
((likely(assertion)) ? 0 : gfs2_assert_warn_i((sdp), #assertion, \ ((likely(assertion)) ? 0 : gfs2_assert_warn_i((sdp), #assertion, \
__FUNCTION__, __FILE__, __LINE__)) __func__, __FILE__, __LINE__))
int gfs2_consist_i(struct gfs2_sbd *sdp, int cluster_wide, int gfs2_consist_i(struct gfs2_sbd *sdp, int cluster_wide,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist(sdp) \ #define gfs2_consist(sdp) \
gfs2_consist_i((sdp), 0, __FUNCTION__, __FILE__, __LINE__) gfs2_consist_i((sdp), 0, __func__, __FILE__, __LINE__)
int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide, int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist_inode(ip) \ #define gfs2_consist_inode(ip) \
gfs2_consist_inode_i((ip), 0, __FUNCTION__, __FILE__, __LINE__) gfs2_consist_inode_i((ip), 0, __func__, __FILE__, __LINE__)
int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide, int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_consist_rgrpd(rgd) \ #define gfs2_consist_rgrpd(rgd) \
gfs2_consist_rgrpd_i((rgd), 0, __FUNCTION__, __FILE__, __LINE__) gfs2_consist_rgrpd_i((rgd), 0, __func__, __FILE__, __LINE__)
int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
...@@ -91,7 +91,7 @@ static inline int gfs2_meta_check_i(struct gfs2_sbd *sdp, ...@@ -91,7 +91,7 @@ static inline int gfs2_meta_check_i(struct gfs2_sbd *sdp,
} }
#define gfs2_meta_check(sdp, bh) \ #define gfs2_meta_check(sdp, bh) \
gfs2_meta_check_i((sdp), (bh), __FUNCTION__, __FILE__, __LINE__) gfs2_meta_check_i((sdp), (bh), __func__, __FILE__, __LINE__)
int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh, int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
...@@ -118,7 +118,7 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp, ...@@ -118,7 +118,7 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp,
} }
#define gfs2_metatype_check(sdp, bh, type) \ #define gfs2_metatype_check(sdp, bh, type) \
gfs2_metatype_check_i((sdp), (bh), (type), __FUNCTION__, __FILE__, __LINE__) gfs2_metatype_check_i((sdp), (bh), (type), __func__, __FILE__, __LINE__)
static inline void gfs2_metatype_set(struct buffer_head *bh, u16 type, static inline void gfs2_metatype_set(struct buffer_head *bh, u16 type,
u16 format) u16 format)
...@@ -134,14 +134,14 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, ...@@ -134,14 +134,14 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,
char *file, unsigned int line); char *file, unsigned int line);
#define gfs2_io_error(sdp) \ #define gfs2_io_error(sdp) \
gfs2_io_error_i((sdp), __FUNCTION__, __FILE__, __LINE__); gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__);
int gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh, int gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,
const char *function, char *file, unsigned int line); const char *function, char *file, unsigned int line);
#define gfs2_io_error_bh(sdp, bh) \ #define gfs2_io_error_bh(sdp, bh) \
gfs2_io_error_bh_i((sdp), (bh), __FUNCTION__, __FILE__, __LINE__); gfs2_io_error_bh_i((sdp), (bh), __func__, __FILE__, __LINE__);
extern struct kmem_cache *gfs2_glock_cachep; extern struct kmem_cache *gfs2_glock_cachep;
......
...@@ -82,28 +82,28 @@ ...@@ -82,28 +82,28 @@
do { \ do { \
printk(JFFS2_ERR_MSG_PREFIX \ printk(JFFS2_ERR_MSG_PREFIX \
" (%d) %s: " fmt, task_pid_nr(current), \ " (%d) %s: " fmt, task_pid_nr(current), \
__FUNCTION__ , ##__VA_ARGS__); \ __func__ , ##__VA_ARGS__); \
} while(0) } while(0)
#define JFFS2_WARNING(fmt, ...) \ #define JFFS2_WARNING(fmt, ...) \
do { \ do { \
printk(JFFS2_WARN_MSG_PREFIX \ printk(JFFS2_WARN_MSG_PREFIX \
" (%d) %s: " fmt, task_pid_nr(current), \ " (%d) %s: " fmt, task_pid_nr(current), \
__FUNCTION__ , ##__VA_ARGS__); \ __func__ , ##__VA_ARGS__); \
} while(0) } while(0)
#define JFFS2_NOTICE(fmt, ...) \ #define JFFS2_NOTICE(fmt, ...) \
do { \ do { \
printk(JFFS2_NOTICE_MSG_PREFIX \ printk(JFFS2_NOTICE_MSG_PREFIX \
" (%d) %s: " fmt, task_pid_nr(current), \ " (%d) %s: " fmt, task_pid_nr(current), \
__FUNCTION__ , ##__VA_ARGS__); \ __func__ , ##__VA_ARGS__); \
} while(0) } while(0)
#define JFFS2_DEBUG(fmt, ...) \ #define JFFS2_DEBUG(fmt, ...) \
do { \ do { \
printk(JFFS2_DBG_MSG_PREFIX \ printk(JFFS2_DBG_MSG_PREFIX \
" (%d) %s: " fmt, task_pid_nr(current), \ " (%d) %s: " fmt, task_pid_nr(current), \
__FUNCTION__ , ##__VA_ARGS__); \ __func__ , ##__VA_ARGS__); \
} while(0) } while(0)
/* /*
......
...@@ -82,7 +82,7 @@ static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_ ...@@ -82,7 +82,7 @@ static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_
static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd) static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
{ {
/* must be called under down_write(xattr_sem) */ /* must be called under down_write(xattr_sem) */
D1(dbg_xattr("%s: xid=%u, version=%u\n", __FUNCTION__, xd->xid, xd->version)); D1(dbg_xattr("%s: xid=%u, version=%u\n", __func__, xd->xid, xd->version));
if (xd->xname) { if (xd->xname) {
c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len); c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len);
kfree(xd->xname); kfree(xd->xname);
...@@ -1252,7 +1252,7 @@ int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ ...@@ -1252,7 +1252,7 @@ int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_
rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE); rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE);
if (rc) { if (rc) {
JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n", JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
__FUNCTION__, rc, totlen); __func__, rc, totlen);
rc = rc ? rc : -EBADFD; rc = rc ? rc : -EBADFD;
goto out; goto out;
} }
......
...@@ -573,7 +573,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl) ...@@ -573,7 +573,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
/* Ensure the resulting lock will get added to granted list */ /* Ensure the resulting lock will get added to granted list */
fl->fl_flags |= FL_SLEEP; fl->fl_flags |= FL_SLEEP;
if (do_vfs_lock(fl) < 0) if (do_vfs_lock(fl) < 0)
printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __FUNCTION__); printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __func__);
up_read(&host->h_rwsem); up_read(&host->h_rwsem);
fl->fl_flags = fl_flags; fl->fl_flags = fl_flags;
status = 0; status = 0;
......
...@@ -752,7 +752,7 @@ nlmsvc_grant_blocked(struct nlm_block *block) ...@@ -752,7 +752,7 @@ nlmsvc_grant_blocked(struct nlm_block *block)
return; return;
default: default:
printk(KERN_WARNING "lockd: unexpected error %d in %s!\n", printk(KERN_WARNING "lockd: unexpected error %d in %s!\n",
-error, __FUNCTION__); -error, __func__);
nlmsvc_insert_block(block, 10 * HZ); nlmsvc_insert_block(block, 10 * HZ);
nlmsvc_release_block(block); nlmsvc_release_block(block);
return; return;
......
...@@ -609,7 +609,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, ...@@ -609,7 +609,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
if (corrupt < 0) { if (corrupt < 0) {
fat_fs_panic(new_dir->i_sb, fat_fs_panic(new_dir->i_sb,
"%s: Filesystem corrupted (i_pos %lld)", "%s: Filesystem corrupted (i_pos %lld)",
__FUNCTION__, sinfo.i_pos); __func__, sinfo.i_pos);
} }
goto out; goto out;
} }
......
...@@ -2329,10 +2329,10 @@ void __init mnt_init(void) ...@@ -2329,10 +2329,10 @@ void __init mnt_init(void)
err = sysfs_init(); err = sysfs_init();
if (err) if (err)
printk(KERN_WARNING "%s: sysfs_init error: %d\n", printk(KERN_WARNING "%s: sysfs_init error: %d\n",
__FUNCTION__, err); __func__, err);
fs_kobj = kobject_create_and_add("fs", NULL); fs_kobj = kobject_create_and_add("fs", NULL);
if (!fs_kobj) if (!fs_kobj)
printk(KERN_WARNING "%s: kobj create error\n", __FUNCTION__); printk(KERN_WARNING "%s: kobj create error\n", __func__);
init_rootfs(); init_rootfs();
init_mount_tree(); init_mount_tree();
} }
......
...@@ -104,7 +104,7 @@ xdr_writemem(__be32 *p, const void *ptr, int nbytes) ...@@ -104,7 +104,7 @@ xdr_writemem(__be32 *p, const void *ptr, int nbytes)
} while (0) } while (0)
#define RESERVE_SPACE(nbytes) do { \ #define RESERVE_SPACE(nbytes) do { \
p = xdr_reserve_space(xdr, nbytes); \ p = xdr_reserve_space(xdr, nbytes); \
if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __FUNCTION__); \ if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __func__); \
BUG_ON(!p); \ BUG_ON(!p); \
} while (0) } while (0)
...@@ -134,7 +134,7 @@ xdr_error: \ ...@@ -134,7 +134,7 @@ xdr_error: \
p = xdr_inline_decode(xdr, nbytes); \ p = xdr_inline_decode(xdr, nbytes); \
if (!p) { \ if (!p) { \
dprintk("NFSD: %s: reply buffer overflowed in line %d.\n", \ dprintk("NFSD: %s: reply buffer overflowed in line %d.\n", \
__FUNCTION__, __LINE__); \ __func__, __LINE__); \
return -EIO; \ return -EIO; \
} \ } \
} while (0) } while (0)
......
...@@ -45,7 +45,7 @@ static void ntfs_debug(const char *f, ...); ...@@ -45,7 +45,7 @@ static void ntfs_debug(const char *f, ...);
extern void __ntfs_debug (const char *file, int line, const char *function, extern void __ntfs_debug (const char *file, int line, const char *function,
const char *format, ...) __attribute__ ((format (printf, 4, 5))); const char *format, ...) __attribute__ ((format (printf, 4, 5)));
#define ntfs_debug(f, a...) \ #define ntfs_debug(f, a...) \
__ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a) __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a)
extern void ntfs_debug_dump_runlist(const runlist_element *rl); extern void ntfs_debug_dump_runlist(const runlist_element *rl);
...@@ -58,10 +58,10 @@ extern void ntfs_debug_dump_runlist(const runlist_element *rl); ...@@ -58,10 +58,10 @@ extern void ntfs_debug_dump_runlist(const runlist_element *rl);
extern void __ntfs_warning(const char *function, const struct super_block *sb, extern void __ntfs_warning(const char *function, const struct super_block *sb,
const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
#define ntfs_warning(sb, f, a...) __ntfs_warning(__FUNCTION__, sb, f, ##a) #define ntfs_warning(sb, f, a...) __ntfs_warning(__func__, sb, f, ##a)
extern void __ntfs_error(const char *function, const struct super_block *sb, extern void __ntfs_error(const char *function, const struct super_block *sb,
const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
#define ntfs_error(sb, f, a...) __ntfs_error(__FUNCTION__, sb, f, ##a) #define ntfs_error(sb, f, a...) __ntfs_error(__func__, sb, f, ##a)
#endif /* _LINUX_NTFS_DEBUG_H */ #endif /* _LINUX_NTFS_DEBUG_H */
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
#ifndef CONFIG_LDM_DEBUG #ifndef CONFIG_LDM_DEBUG
#define ldm_debug(...) do {} while (0) #define ldm_debug(...) do {} while (0)
#else #else
#define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __FUNCTION__, f, ##a) #define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __func__, f, ##a)
#endif #endif
#define ldm_crit(f, a...) _ldm_printk (KERN_CRIT, __FUNCTION__, f, ##a) #define ldm_crit(f, a...) _ldm_printk (KERN_CRIT, __func__, f, ##a)
#define ldm_error(f, a...) _ldm_printk (KERN_ERR, __FUNCTION__, f, ##a) #define ldm_error(f, a...) _ldm_printk (KERN_ERR, __func__, f, ##a)
#define ldm_info(f, a...) _ldm_printk (KERN_INFO, __FUNCTION__, f, ##a) #define ldm_info(f, a...) _ldm_printk (KERN_INFO, __func__, f, ##a)
__attribute__ ((format (printf, 3, 4))) __attribute__ ((format (printf, 3, 4)))
static void _ldm_printk (const char *level, const char *function, static void _ldm_printk (const char *level, const char *function,
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
* these are normally enabled. * these are normally enabled.
*/ */
#ifdef SMBFS_PARANOIA #ifdef SMBFS_PARANOIA
# define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a) # define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __func__ , ## a)
#else #else
# define PARANOIA(f, a...) do { ; } while(0) # define PARANOIA(f, a...) do { ; } while(0)
#endif #endif
/* lots of debug messages */ /* lots of debug messages */
#ifdef SMBFS_DEBUG_VERBOSE #ifdef SMBFS_DEBUG_VERBOSE
# define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) # define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
#else #else
# define VERBOSE(f, a...) do { ; } while(0) # define VERBOSE(f, a...) do { ; } while(0)
#endif #endif
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* too common name. * too common name.
*/ */
#ifdef SMBFS_DEBUG #ifdef SMBFS_DEBUG
#define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) #define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
#else #else
#define DEBUG1(f, a...) do { ; } while(0) #define DEBUG1(f, a...) do { ; } while(0)
#endif #endif
...@@ -135,7 +135,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos) ...@@ -135,7 +135,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
goto out; goto out;
} }
pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
__FUNCTION__, count, *ppos, buffer->page); __func__, count, *ppos, buffer->page);
retval = simple_read_from_buffer(buf, count, ppos, buffer->page, retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
buffer->count); buffer->count);
out: out:
......
...@@ -61,7 +61,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -61,7 +61,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
/* instantiate and link root dentry */ /* instantiate and link root dentry */
root = d_alloc_root(inode); root = d_alloc_root(inode);
if (!root) { if (!root) {
pr_debug("%s: could not get root dentry!\n",__FUNCTION__); pr_debug("%s: could not get root dentry!\n",__func__);
iput(inode); iput(inode);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -240,7 +240,7 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count) ...@@ -240,7 +240,7 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count)
sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map), sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map),
GFP_KERNEL); GFP_KERNEL);
if (!sbi->s_partmaps) { if (!sbi->s_partmaps) {
udf_error(sb, __FUNCTION__, udf_error(sb, __func__,
"Unable to allocate space for %d partition maps", "Unable to allocate space for %d partition maps",
count); count);
sbi->s_partitions = 0; sbi->s_partitions = 0;
...@@ -1086,7 +1086,7 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index) ...@@ -1086,7 +1086,7 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)
bitmap = vmalloc(size); /* TODO: get rid of vmalloc */ bitmap = vmalloc(size); /* TODO: get rid of vmalloc */
if (bitmap == NULL) { if (bitmap == NULL) {
udf_error(sb, __FUNCTION__, udf_error(sb, __func__,
"Unable to allocate space for bitmap " "Unable to allocate space for bitmap "
"and %d buffer_head pointers", nr_groups); "and %d buffer_head pointers", nr_groups);
return NULL; return NULL;
......
...@@ -986,7 +986,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -986,7 +986,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
if (corrupt < 0) { if (corrupt < 0) {
fat_fs_panic(new_dir->i_sb, fat_fs_panic(new_dir->i_sb,
"%s: Filesystem corrupted (i_pos %lld)", "%s: Filesystem corrupted (i_pos %lld)",
__FUNCTION__, sinfo.i_pos); __func__, sinfo.i_pos);
} }
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment