[pnfs] [PATCH 3/4] [SQUASHME] pnfs: change __FUNCTION__ to __func__

Benny Halevy bhalevy at panasas.com
Tue Jun 3 13:49:48 EDT 2008


Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4proc.c |    4 ++--
 fs/nfs/nfs4xdr.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 78c6c75..a56a89c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2971,7 +2971,7 @@ static int pnfs4_read_done(struct rpc_task *task, struct nfs_read_data *data)
 
 	if (nfs4_async_handle_error(task, mds_svr, client) == -EAGAIN) {
 		rpc_restart_call(task);
-		dprintk("<-- %s status= %d\n", __FUNCTION__, -EAGAIN);
+		dprintk("<-- %s status= %d\n", __func__, -EAGAIN);
 		return -EAGAIN;
 	}
 
@@ -3011,7 +3011,7 @@ static int pnfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
 	*/
 	if (nfs4_async_handle_error(task, mds_svr, client) == -EAGAIN) {
 			rpc_restart_call(task);
-			dprintk("<-- %s status= %d\n", __FUNCTION__, -EAGAIN);
+			dprintk("<-- %s status= %d\n", __func__, -EAGAIN);
 			return -EAGAIN;
 	}
 
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index df6f4ea..884c42d 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1858,7 +1858,7 @@ static int encode_pnfs_layoutget(struct xdr_stream *xdr,
 	WRITE32(args->maxcount);
 
 	dprintk("%s: 1st type:0x%x iomode:%d off:%lu len:%lu mc:%d\n",
-		__FUNCTION__,
+		__func__,
 		args->type,
 		args->lseg.iomode,
 		(unsigned long)args->lseg.offset,
@@ -5555,7 +5555,7 @@ static int decode_pnfs_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,
 	READ32(res->layout.len);
 
 	dprintk("%s roff:%lu rlen:%lu riomode:%d, lo_type:0x%x, lo.len:%d\n",
-		__FUNCTION__,
+		__func__,
 		(unsigned long)res->lseg.offset,
 		(unsigned long)res->lseg.length,
 		res->lseg.iomode,
-- 
1.5.3.3



More information about the pNFS mailing list