diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 20:14:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-17 20:14:43 -0700 |
| commit | b42895d6fe66995ab101c15d9a59c78474dbf382 (patch) | |
| tree | 34c518a9fd51385848eb2f1017c9b0b81757a2c6 /fs/nfs/nfs4proc.c | |
| parent | d3a36fb82a0864a85e238ac946817030a18c5f9a (diff) | |
| parent | dd504ea16f34a29da4aa933ae7ab917fcfd25fd7 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
SUNRPC: Fix sparse warnings
NLM: Fix sparse warnings
NFS: Fix more sparse warnings
NFS: Fix some 'sparse' warnings...
SUNRPC: remove dead variable 'rpciod_running'
NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c
NFS: use zero_user_page
NLM: don't use CLONE_SIGHAND in nlmclnt_recovery
NLM: Fix locking client timeouts...
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d6a30e96578..648e0ac0f90 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -790,7 +790,7 @@ out: return -EACCES; } -int nfs4_recover_expired_lease(struct nfs_server *server) +static int nfs4_recover_expired_lease(struct nfs_server *server) { struct nfs_client *clp = server->nfs_client; int ret; @@ -2748,7 +2748,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) /* This is the error handling routine for processes that are allowed * to sleep. */ -int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception) +static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception) { struct nfs_client *clp = server->nfs_client; int ret = errorcode; |