Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
  nfs: make nfs4_drop_state_owner() static
  nfs: path_{get,put}() cleanups
  nfs: replace remaining __FUNCTION__ occurrences
  nfs/lsm: make NFSv4 set LSM mount options
  NFSv4: Check the return value of decode_compound_hdr_arg()
  nfs: fix race in nfs_dirty_request
  NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 5ccf7faee19c..03599bfe81cf 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -63,17 +63,17 @@ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
         };
         int status;
 
-        dprintk("%s: call getattr\n", __FUNCTION__);
+        dprintk("%s: call getattr\n", __func__);
         nfs_fattr_init(fattr);
         status = rpc_call_sync(server->nfs_client->cl_rpcclient, &msg, 0);
-        dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);
+        dprintk("%s: reply getattr: %d\n", __func__, status);
         if (status)
                 return status;
-        dprintk("%s: call statfs\n", __FUNCTION__);
+        dprintk("%s: call statfs\n", __func__);
         msg.rpc_proc = &nfs_procedures[NFSPROC_STATFS];
         msg.rpc_resp = &fsinfo;
         status = rpc_call_sync(server->nfs_client->cl_rpcclient, &msg, 0);
-        dprintk("%s: reply statfs: %d\n", __FUNCTION__, status);
+        dprintk("%s: reply statfs: %d\n", __func__, status);
         if (status)
                 return status;
         info->rtmax  = NFS_MAXDATA;