aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/direct-io.c2
-rw-r--r--fs/fuse/dir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 3f92cba09..7932160ec 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1367,7 +1367,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
dio_submit_t submit_io, int flags)
{
- //printk("%s:%d:DENIS \n", __FUNCTION__, __LINE__);
+ //printk("%s:%d:DENIS \n", __func__, __LINE__);
/*
* The block device state is needed in the end to finally
* submit everything. Since it's likely to be cache cold
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 4bcfa94cb..ef45f2572 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -668,7 +668,7 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,
dput(alias);
iput(inode);
- printk(KERN_ERR "fuse:%s: EBUSY caused from that the directory,'%s', has alias. Use FUSE_USERS to find the reason. \n", __FUNCTION__, entry->d_name.name);
+ printk(KERN_ERR "fuse:%s: EBUSY caused from that the directory,'%s', has alias. Use FUSE_USERS to find the reason. \n", __func__, entry->d_name.name);
fuse_users(dir, entry);
return -EBUSY;
}