Skip to content

Commit

Permalink
nfs: replace remaining __FUNCTION__ occurrences
Browse files Browse the repository at this point in the history 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
@hharrison
hharrison authored and Trond Myklebust committed May 16, 2008
1 parent 46c8ac7 commit 3110ff8
Show file tree
Hide file tree
Showing 18 changed files with 123 additions and 123 deletions.
2 changes: 1 addition & 1 deletion fs/nfs/callback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)
if (clp == NULL)
return SVC_DROP;

dprintk("%s: %s NFSv4 callback!\n", __FUNCTION__,
dprintk("%s: %s NFSv4 callback!\n", __func__,
svc_print_addr(rqstp, buf, sizeof(buf)));
nfs_put_client(clp);

Expand Down
4 changes: 2 additions & 2 deletions fs/nfs/callback_proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *
out_putclient:
nfs_put_client(clp);
out:
dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(res->status));
dprintk("%s: exit with status = %d\n", __func__, ntohl(res->status));
return res->status;
}

Expand Down Expand Up @@ -98,6 +98,6 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
nfs_put_client(prev);
} while (clp != NULL);
out:
dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(res));
dprintk("%s: exit with status = %d\n", __func__, ntohl(res));
return res;
}
18 changes: 9 additions & 9 deletions fs/nfs/callback_xdr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
/* We do not like overly long tags! */
if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) {
printk("NFSv4 CALLBACK %s: client sent tag of length %u\n",
__FUNCTION__, hdr->taglen);
__func__, hdr->taglen);
return htonl(NFS4ERR_RESOURCE);
}
p = read_buf(xdr, 12);
Expand All @@ -151,7 +151,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
/* Check minor version is zero. */
if (minor_version != 0) {
printk(KERN_WARNING "%s: NFSv4 server callback with illegal minor version %u!\n",
__FUNCTION__, minor_version);
__func__, minor_version);
return htonl(NFS4ERR_MINOR_VERS_MISMATCH);
}
hdr->callback_ident = ntohl(*p++);
Expand Down Expand Up @@ -179,7 +179,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr
args->addr = svc_addr(rqstp);
status = decode_bitmap(xdr, args->bitmap);
out:
dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));
dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
return status;
}

Expand All @@ -200,7 +200,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
args->truncate = ntohl(*p);
status = decode_fh(xdr, &args->fh);
out:
dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));
dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
return status;
}

Expand Down Expand Up @@ -349,7 +349,7 @@ static __be32 encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr,
status = encode_attr_mtime(xdr, res->bitmap, &res->mtime);
*savep = htonl((unsigned int)((char *)xdr->p - (char *)(savep+1)));
out:
dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));
dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
return status;
}

Expand All @@ -363,7 +363,7 @@ static __be32 process_op(struct svc_rqst *rqstp,
long maxlen;
__be32 res;

dprintk("%s: start\n", __FUNCTION__);
dprintk("%s: start\n", __func__);
status = decode_op_hdr(xdr_in, &op_nr);
if (likely(status == 0)) {
switch (op_nr) {
Expand Down Expand Up @@ -392,7 +392,7 @@ static __be32 process_op(struct svc_rqst *rqstp,
status = res;
if (op->encode_res != NULL && status == 0)
status = op->encode_res(rqstp, xdr_out, resp);
dprintk("%s: done, status = %d\n", __FUNCTION__, ntohl(status));
dprintk("%s: done, status = %d\n", __func__, ntohl(status));
return status;
}

Expand All @@ -408,7 +408,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
__be32 status;
unsigned int nops = 0;

dprintk("%s: start\n", __FUNCTION__);
dprintk("%s: start\n", __func__);

xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);

Expand All @@ -431,7 +431,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r

*hdr_res.status = status;
*hdr_res.nops = htonl(nops);
dprintk("%s: done, status = %u\n", __FUNCTION__, ntohl(status));
dprintk("%s: done, status = %u\n", __func__, ntohl(status));
return rpc_success;
}

Expand Down
8 changes: 4 additions & 4 deletions fs/nfs/client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp,
clnt = rpc_create(&args);
if (IS_ERR(clnt)) {
dprintk("%s: cannot create RPC client. Error = %ld\n",
__FUNCTION__, PTR_ERR(clnt));
__func__, PTR_ERR(clnt));
return PTR_ERR(clnt);
}

Expand Down Expand Up @@ -576,7 +576,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server,

server->client = rpc_clone_client(clp->cl_rpcclient);
if (IS_ERR(server->client)) {
dprintk("%s: couldn't create rpc_client!\n", __FUNCTION__);
dprintk("%s: couldn't create rpc_client!\n", __func__);
return PTR_ERR(server->client);
}

Expand All @@ -590,7 +590,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server,

auth = rpcauth_create(pseudoflavour, server->client);
if (IS_ERR(auth)) {
dprintk("%s: couldn't create credcache!\n", __FUNCTION__);
dprintk("%s: couldn't create credcache!\n", __func__);
return PTR_ERR(auth);
}
}
Expand Down Expand Up @@ -985,7 +985,7 @@ static int nfs4_init_client(struct nfs_client *clp,
error = nfs_idmap_new(clp);
if (error < 0) {
dprintk("%s: failed to create idmapper. Error = %d\n",
__FUNCTION__, error);
__func__, error);
goto error;
}
__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
Expand Down
4 changes: 2 additions & 2 deletions fs/nfs/delegation.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
switch (status) {
default:
printk(KERN_ERR "%s: unhandled error %d.\n",
__FUNCTION__, status);
__func__, status);
case -NFS4ERR_EXPIRED:
/* kill_proc(fl->fl_pid, SIGLOST, 1); */
case -NFS4ERR_STALE_CLIENTID:
Expand Down Expand Up @@ -186,7 +186,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
*/
dfprintk(FILE, "%s: server %s handed out "
"a duplicate delegation!\n",
__FUNCTION__, clp->cl_hostname);
__func__, clp->cl_hostname);
if (delegation->type <= nfsi->delegation->type) {
freeme = delegation;
delegation = NULL;
Expand Down
18 changes: 9 additions & 9 deletions fs/nfs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
int error;

dfprintk(DIRCACHE, "NFS: %s: reading cookie %Lu into page %lu\n",
__FUNCTION__, (long long)desc->entry->cookie,
__func__, (long long)desc->entry->cookie,
page->index);

again:
Expand Down Expand Up @@ -256,7 +256,7 @@ int find_dirent(nfs_readdir_descriptor_t *desc)

while((status = dir_decode(desc)) == 0) {
dfprintk(DIRCACHE, "NFS: %s: examining cookie %Lu\n",
__FUNCTION__, (unsigned long long)entry->cookie);
__func__, (unsigned long long)entry->cookie);
if (entry->prev_cookie == *desc->dir_cookie)
break;
if (loop_count++ > 200) {
Expand Down Expand Up @@ -315,7 +315,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
int status;

dfprintk(DIRCACHE, "NFS: %s: searching page %ld for target %Lu\n",
__FUNCTION__, desc->page_index,
__func__, desc->page_index,
(long long) *desc->dir_cookie);

/* If we find the page in the page_cache, we cannot be sure
Expand All @@ -339,7 +339,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
if (status < 0)
dir_page_release(desc);
out:
dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, status);
dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __func__, status);
return status;
}

Expand Down Expand Up @@ -380,7 +380,7 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
}
}

dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, res);
dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __func__, res);
return res;
}

Expand Down Expand Up @@ -506,7 +506,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
desc->entry->eof = 0;
out:
dfprintk(DIRCACHE, "NFS: %s: returns %d\n",
__FUNCTION__, status);
__func__, status);
return status;
out_release:
dir_page_release(desc);
Expand Down Expand Up @@ -780,7 +780,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)

if (is_bad_inode(inode)) {
dfprintk(LOOKUPCACHE, "%s: %s/%s has dud inode\n",
__FUNCTION__, dentry->d_parent->d_name.name,
__func__, dentry->d_parent->d_name.name,
dentry->d_name.name);
goto out_bad;
}
Expand Down Expand Up @@ -808,7 +808,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
unlock_kernel();
dput(parent);
dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is valid\n",
__FUNCTION__, dentry->d_parent->d_name.name,
__func__, dentry->d_parent->d_name.name,
dentry->d_name.name);
return 1;
out_zap_parent:
Expand All @@ -827,7 +827,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
unlock_kernel();
dput(parent);
dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n",
__FUNCTION__, dentry->d_parent->d_name.name,
__func__, dentry->d_parent->d_name.name,
dentry->d_name.name);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
if (res < 0)
dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
" - error %d!\n",
__FUNCTION__, res);
__func__, res);
return res;
}

Expand Down
4 changes: 2 additions & 2 deletions fs/nfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
unsigned long now = jiffies;

dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
__FUNCTION__, inode->i_sb->s_id, inode->i_ino,
__func__, inode->i_sb->s_id, inode->i_ino,
atomic_read(&inode->i_count), fattr->valid);

if (nfsi->fileid != fattr->fileid)
Expand Down Expand Up @@ -1126,7 +1126,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
* Big trouble! The inode has become a different object.
*/
printk(KERN_DEBUG "%s: inode %ld mode changed, %07o to %07o\n",
__FUNCTION__, inode->i_ino, inode->i_mode, fattr->mode);
__func__, inode->i_ino, inode->i_mode, fattr->mode);
out_err:
/*
* No need to worry about unhashing the dentry, as the
Expand Down
8 changes: 4 additions & 4 deletions fs/nfs/namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
dprintk("--> nfs_follow_mountpoint()\n");

BUG_ON(IS_ROOT(dentry));
dprintk("%s: enter\n", __FUNCTION__);
dprintk("%s: enter\n", __func__);
dput(nd->path.dentry);
nd->path.dentry = dget(dentry);

Expand Down Expand Up @@ -143,7 +143,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
nd->path.dentry = dget(mnt->mnt_root);
schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout);
out:
dprintk("%s: done, returned %d\n", __FUNCTION__, err);
dprintk("%s: done, returned %d\n", __func__, err);

dprintk("<-- nfs_follow_mountpoint() = %d\n", err);
return ERR_PTR(err);
Expand Down Expand Up @@ -230,7 +230,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,

dprintk("--> nfs_do_submount()\n");

dprintk("%s: submounting on %s/%s\n", __FUNCTION__,
dprintk("%s: submounting on %s/%s\n", __func__,
dentry->d_parent->d_name.name,
dentry->d_name.name);
if (page == NULL)
Expand All @@ -243,7 +243,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
free_page:
free_page((unsigned long)page);
out:
dprintk("%s: done\n", __FUNCTION__);
dprintk("%s: done\n", __func__);

dprintk("<-- nfs_do_submount() = %p\n", mnt);
return mnt;
Expand Down
6 changes: 3 additions & 3 deletions fs/nfs/nfs3proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle,
};
int status;

dprintk("%s: call fsinfo\n", __FUNCTION__);
dprintk("%s: call fsinfo\n", __func__);
nfs_fattr_init(info->fattr);
status = rpc_call_sync(client, &msg, 0);
dprintk("%s: reply fsinfo: %d\n", __FUNCTION__, status);
dprintk("%s: reply fsinfo: %d\n", __func__, status);
if (!(info->fattr->valid & NFS_ATTR_FATTR)) {
msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR];
msg.rpc_resp = info->fattr;
status = rpc_call_sync(client, &msg, 0);
dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);
dprintk("%s: reply getattr: %d\n", __func__, status);
}
return status;
}
Expand Down
12 changes: 6 additions & 6 deletions fs/nfs/nfs4namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static int nfs4_validate_fspath(const struct vfsmount *mnt_parent,

if (strncmp(path, fs_path, strlen(fs_path)) != 0) {
dprintk("%s: path %s does not begin with fsroot %s\n",
__FUNCTION__, path, fs_path);
__func__, path, fs_path);
return -ENOENT;
}

Expand Down Expand Up @@ -134,7 +134,7 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
if (locations == NULL || locations->nlocations <= 0)
goto out;

dprintk("%s: referral at %s/%s\n", __FUNCTION__,
dprintk("%s: referral at %s/%s\n", __func__,
dentry->d_parent->d_name.name, dentry->d_name.name);

page = (char *) __get_free_page(GFP_USER);
Expand Down Expand Up @@ -204,7 +204,7 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
out:
free_page((unsigned long) page);
free_page((unsigned long) page2);
dprintk("%s: done\n", __FUNCTION__);
dprintk("%s: done\n", __func__);
return mnt;
}

Expand All @@ -223,7 +223,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr
int err;

/* BUG_ON(IS_ROOT(dentry)); */
dprintk("%s: enter\n", __FUNCTION__);
dprintk("%s: enter\n", __func__);

page = alloc_page(GFP_KERNEL);
if (page == NULL)
Expand All @@ -238,7 +238,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr

parent = dget_parent(dentry);
dprintk("%s: getting locations for %s/%s\n",
__FUNCTION__, parent->d_name.name, dentry->d_name.name);
__func__, parent->d_name.name, dentry->d_name.name);

err = nfs4_proc_fs_locations(parent->d_inode, &dentry->d_name, fs_locations, page);
dput(parent);
Expand All @@ -252,6 +252,6 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr
__free_page(page);
kfree(fs_locations);
out:
dprintk("%s: done\n", __FUNCTION__);
dprintk("%s: done\n", __func__);
return mnt;
}
Loading

0 comments on commit 3110ff8

Please sign in to comment.