Commit adfa6f98 authored by David Howells's avatar David Howells Committed by Trond Myklebust

NFS: Rename struct nfs4_client to struct nfs_client

Rename struct nfs4_client to struct nfs_client so that it can become the basis
for a general client record for NFS2 and NFS3 in addition to NFS4.
Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 5ae1fbce
...@@ -167,7 +167,7 @@ void nfs_callback_down(void) ...@@ -167,7 +167,7 @@ void nfs_callback_down(void)
static int nfs_callback_authenticate(struct svc_rqst *rqstp) static int nfs_callback_authenticate(struct svc_rqst *rqstp)
{ {
struct in_addr *addr = &rqstp->rq_addr.sin_addr; struct in_addr *addr = &rqstp->rq_addr.sin_addr;
struct nfs4_client *clp; struct nfs_client *clp;
/* Don't talk to strangers */ /* Don't talk to strangers */
clp = nfs4_find_client(addr); clp = nfs4_find_client(addr);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res) unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct nfs_inode *nfsi; struct nfs_inode *nfsi;
struct inode *inode; struct inode *inode;
...@@ -56,7 +56,7 @@ unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres ...@@ -56,7 +56,7 @@ unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres
unsigned nfs4_callback_recall(struct cb_recallargs *args, void *dummy) unsigned nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
struct inode *inode; struct inode *inode;
unsigned res; unsigned res;
......
...@@ -114,7 +114,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, st ...@@ -114,7 +114,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, st
*/ */
int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res) int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res)
{ {
struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int status = 0; int status = 0;
...@@ -176,7 +176,7 @@ static void nfs_msync_inode(struct inode *inode) ...@@ -176,7 +176,7 @@ static void nfs_msync_inode(struct inode *inode)
*/ */
int __nfs_inode_return_delegation(struct inode *inode) int __nfs_inode_return_delegation(struct inode *inode)
{ {
struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int res = 0; int res = 0;
...@@ -208,7 +208,7 @@ int __nfs_inode_return_delegation(struct inode *inode) ...@@ -208,7 +208,7 @@ int __nfs_inode_return_delegation(struct inode *inode)
*/ */
void nfs_return_all_delegations(struct super_block *sb) void nfs_return_all_delegations(struct super_block *sb)
{ {
struct nfs4_client *clp = NFS_SB(sb)->nfs4_state; struct nfs_client *clp = NFS_SB(sb)->nfs4_state;
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *inode; struct inode *inode;
...@@ -232,7 +232,7 @@ void nfs_return_all_delegations(struct super_block *sb) ...@@ -232,7 +232,7 @@ void nfs_return_all_delegations(struct super_block *sb)
int nfs_do_expire_all_delegations(void *ptr) int nfs_do_expire_all_delegations(void *ptr)
{ {
struct nfs4_client *clp = ptr; struct nfs_client *clp = ptr;
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *inode; struct inode *inode;
...@@ -258,7 +258,7 @@ int nfs_do_expire_all_delegations(void *ptr) ...@@ -258,7 +258,7 @@ int nfs_do_expire_all_delegations(void *ptr)
module_put_and_exit(0); module_put_and_exit(0);
} }
void nfs_expire_all_delegations(struct nfs4_client *clp) void nfs_expire_all_delegations(struct nfs_client *clp)
{ {
struct task_struct *task; struct task_struct *task;
...@@ -276,7 +276,7 @@ void nfs_expire_all_delegations(struct nfs4_client *clp) ...@@ -276,7 +276,7 @@ void nfs_expire_all_delegations(struct nfs4_client *clp)
/* /*
* Return all delegations following an NFS4ERR_CB_PATH_DOWN error. * Return all delegations following an NFS4ERR_CB_PATH_DOWN error.
*/ */
void nfs_handle_cb_pathdown(struct nfs4_client *clp) void nfs_handle_cb_pathdown(struct nfs_client *clp)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *inode; struct inode *inode;
...@@ -299,7 +299,7 @@ void nfs_handle_cb_pathdown(struct nfs4_client *clp) ...@@ -299,7 +299,7 @@ void nfs_handle_cb_pathdown(struct nfs4_client *clp)
struct recall_threadargs { struct recall_threadargs {
struct inode *inode; struct inode *inode;
struct nfs4_client *clp; struct nfs_client *clp;
const nfs4_stateid *stateid; const nfs4_stateid *stateid;
struct completion started; struct completion started;
...@@ -310,7 +310,7 @@ static int recall_thread(void *data) ...@@ -310,7 +310,7 @@ static int recall_thread(void *data)
{ {
struct recall_threadargs *args = (struct recall_threadargs *)data; struct recall_threadargs *args = (struct recall_threadargs *)data;
struct inode *inode = igrab(args->inode); struct inode *inode = igrab(args->inode);
struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
...@@ -371,7 +371,7 @@ int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *s ...@@ -371,7 +371,7 @@ int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *s
/* /*
* Retrieve the inode associated with a delegation * Retrieve the inode associated with a delegation
*/ */
struct inode *nfs_delegation_find_inode(struct nfs4_client *clp, const struct nfs_fh *fhandle) struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *res = NULL; struct inode *res = NULL;
...@@ -389,7 +389,7 @@ struct inode *nfs_delegation_find_inode(struct nfs4_client *clp, const struct nf ...@@ -389,7 +389,7 @@ struct inode *nfs_delegation_find_inode(struct nfs4_client *clp, const struct nf
/* /*
* Mark all delegations as needing to be reclaimed * Mark all delegations as needing to be reclaimed
*/ */
void nfs_delegation_mark_reclaim(struct nfs4_client *clp) void nfs_delegation_mark_reclaim(struct nfs_client *clp)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
...@@ -401,7 +401,7 @@ void nfs_delegation_mark_reclaim(struct nfs4_client *clp) ...@@ -401,7 +401,7 @@ void nfs_delegation_mark_reclaim(struct nfs4_client *clp)
/* /*
* Reap all unclaimed delegations after reboot recovery is done * Reap all unclaimed delegations after reboot recovery is done
*/ */
void nfs_delegation_reap_unclaimed(struct nfs4_client *clp) void nfs_delegation_reap_unclaimed(struct nfs_client *clp)
{ {
struct nfs_delegation *delegation, *n; struct nfs_delegation *delegation, *n;
LIST_HEAD(head); LIST_HEAD(head);
...@@ -423,7 +423,7 @@ void nfs_delegation_reap_unclaimed(struct nfs4_client *clp) ...@@ -423,7 +423,7 @@ void nfs_delegation_reap_unclaimed(struct nfs4_client *clp)
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode) int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode)
{ {
struct nfs4_client *clp = NFS_SERVER(inode)->nfs4_state; struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int res = 0; int res = 0;
......
...@@ -29,13 +29,13 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, st ...@@ -29,13 +29,13 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, st
int __nfs_inode_return_delegation(struct inode *inode); int __nfs_inode_return_delegation(struct inode *inode);
int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid); int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);
struct inode *nfs_delegation_find_inode(struct nfs4_client *clp, const struct nfs_fh *fhandle); struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle);
void nfs_return_all_delegations(struct super_block *sb); void nfs_return_all_delegations(struct super_block *sb);
void nfs_expire_all_delegations(struct nfs4_client *clp); void nfs_expire_all_delegations(struct nfs_client *clp);
void nfs_handle_cb_pathdown(struct nfs4_client *clp); void nfs_handle_cb_pathdown(struct nfs_client *clp);
void nfs_delegation_mark_reclaim(struct nfs4_client *clp); void nfs_delegation_mark_reclaim(struct nfs_client *clp);
void nfs_delegation_reap_unclaimed(struct nfs4_client *clp); void nfs_delegation_reap_unclaimed(struct nfs_client *clp);
/* NFSv4 delegation-related procedures */ /* NFSv4 delegation-related procedures */
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid); int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid);
......
...@@ -109,7 +109,7 @@ static struct rpc_pipe_ops idmap_upcall_ops = { ...@@ -109,7 +109,7 @@ static struct rpc_pipe_ops idmap_upcall_ops = {
}; };
void void
nfs_idmap_new(struct nfs4_client *clp) nfs_idmap_new(struct nfs_client *clp)
{ {
struct idmap *idmap; struct idmap *idmap;
...@@ -138,7 +138,7 @@ nfs_idmap_new(struct nfs4_client *clp) ...@@ -138,7 +138,7 @@ nfs_idmap_new(struct nfs4_client *clp)
} }
void void
nfs_idmap_delete(struct nfs4_client *clp) nfs_idmap_delete(struct nfs_client *clp)
{ {
struct idmap *idmap = clp->cl_idmap; struct idmap *idmap = clp->cl_idmap;
...@@ -491,27 +491,27 @@ static unsigned int fnvhash32(const void *buf, size_t buflen) ...@@ -491,27 +491,27 @@ static unsigned int fnvhash32(const void *buf, size_t buflen)
return (hash); return (hash);
} }
int nfs_map_name_to_uid(struct nfs4_client *clp, const char *name, size_t namelen, __u32 *uid) int nfs_map_name_to_uid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *uid)
{ {
struct idmap *idmap = clp->cl_idmap; struct idmap *idmap = clp->cl_idmap;
return nfs_idmap_id(idmap, &idmap->idmap_user_hash, name, namelen, uid); return nfs_idmap_id(idmap, &idmap->idmap_user_hash, name, namelen, uid);
} }
int nfs_map_group_to_gid(struct nfs4_client *clp, const char *name, size_t namelen, __u32 *uid) int nfs_map_group_to_gid(struct nfs_client *clp, const char *name, size_t namelen, __u32 *uid)
{ {
struct idmap *idmap = clp->cl_idmap; struct idmap *idmap = clp->cl_idmap;
return nfs_idmap_id(idmap, &idmap->idmap_group_hash, name, namelen, uid); return nfs_idmap_id(idmap, &idmap->idmap_group_hash, name, namelen, uid);
} }
int nfs_map_uid_to_name(struct nfs4_client *clp, __u32 uid, char *buf) int nfs_map_uid_to_name(struct nfs_client *clp, __u32 uid, char *buf)
{ {
struct idmap *idmap = clp->cl_idmap; struct idmap *idmap = clp->cl_idmap;
return nfs_idmap_name(idmap, &idmap->idmap_user_hash, uid, buf); return nfs_idmap_name(idmap, &idmap->idmap_user_hash, uid, buf);
} }
int nfs_map_gid_to_group(struct nfs4_client *clp, __u32 uid, char *buf) int nfs_map_gid_to_group(struct nfs_client *clp, __u32 uid, char *buf)
{ {
struct idmap *idmap = clp->cl_idmap; struct idmap *idmap = clp->cl_idmap;
......
...@@ -43,9 +43,9 @@ enum nfs4_client_state { ...@@ -43,9 +43,9 @@ enum nfs4_client_state {
}; };
/* /*
* The nfs4_client identifies our client state to the server. * The nfs_client identifies our client state to the server.
*/ */
struct nfs4_client { struct nfs_client {
struct list_head cl_servers; /* Global list of servers */ struct list_head cl_servers; /* Global list of servers */
struct in_addr cl_addr; /* Server identifier */ struct in_addr cl_addr; /* Server identifier */
u64 cl_clientid; /* constant */ u64 cl_clientid; /* constant */
...@@ -127,7 +127,7 @@ static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status ...@@ -127,7 +127,7 @@ static inline void nfs_confirm_seqid(struct nfs_seqid_counter *seqid, int status
struct nfs4_state_owner { struct nfs4_state_owner {
spinlock_t so_lock; spinlock_t so_lock;
struct list_head so_list; /* per-clientid list of state_owners */ struct list_head so_list; /* per-clientid list of state_owners */
struct nfs4_client *so_client; struct nfs_client *so_client;
u32 so_id; /* 32-bit identifier, unique */ u32 so_id; /* 32-bit identifier, unique */
atomic_t so_count; atomic_t so_count;
...@@ -210,10 +210,10 @@ extern ssize_t nfs4_listxattr(struct dentry *, char *, size_t); ...@@ -210,10 +210,10 @@ extern ssize_t nfs4_listxattr(struct dentry *, char *, size_t);
/* nfs4proc.c */ /* nfs4proc.c */
extern int nfs4_map_errors(int err); extern int nfs4_map_errors(int err);
extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short, struct rpc_cred *); extern int nfs4_proc_setclientid(struct nfs_client *, u32, unsigned short, struct rpc_cred *);
extern int nfs4_proc_setclientid_confirm(struct nfs4_client *, struct rpc_cred *); extern int nfs4_proc_setclientid_confirm(struct nfs_client *, struct rpc_cred *);
extern int nfs4_proc_async_renew(struct nfs4_client *, struct rpc_cred *); extern int nfs4_proc_async_renew(struct nfs_client *, struct rpc_cred *);
extern int nfs4_proc_renew(struct nfs4_client *, struct rpc_cred *); extern int nfs4_proc_renew(struct nfs_client *, struct rpc_cred *);
extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state); extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state);
extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *); extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *); extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);
...@@ -231,19 +231,19 @@ extern const u32 nfs4_fsinfo_bitmap[2]; ...@@ -231,19 +231,19 @@ extern const u32 nfs4_fsinfo_bitmap[2];
extern const u32 nfs4_fs_locations_bitmap[2]; extern const u32 nfs4_fs_locations_bitmap[2];
/* nfs4renewd.c */ /* nfs4renewd.c */
extern void nfs4_schedule_state_renewal(struct nfs4_client *); extern void nfs4_schedule_state_renewal(struct nfs_client *);
extern void nfs4_renewd_prepare_shutdown(struct nfs_server *); extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);
extern void nfs4_kill_renewd(struct nfs4_client *); extern void nfs4_kill_renewd(struct nfs_client *);
extern void nfs4_renew_state(void *); extern void nfs4_renew_state(void *);
/* nfs4state.c */ /* nfs4state.c */
extern void init_nfsv4_state(struct nfs_server *); extern void init_nfsv4_state(struct nfs_server *);
extern void destroy_nfsv4_state(struct nfs_server *); extern void destroy_nfsv4_state(struct nfs_server *);
extern struct nfs4_client *nfs4_get_client(struct in_addr *); extern struct nfs_client *nfs4_get_client(struct in_addr *);
extern void nfs4_put_client(struct nfs4_client *clp); extern void nfs4_put_client(struct nfs_client *clp);
extern struct nfs4_client *nfs4_find_client(struct in_addr *); extern struct nfs_client *nfs4_find_client(struct in_addr *);
struct rpc_cred *nfs4_get_renew_cred(struct nfs4_client *clp); struct rpc_cred *nfs4_get_renew_cred(struct nfs_client *clp);
extern u32 nfs4_alloc_lockowner_id(struct nfs4_client *); extern u32 nfs4_alloc_lockowner_id(struct nfs_client *);
extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *); extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *);
extern void nfs4_put_state_owner(struct nfs4_state_owner *); extern void nfs4_put_state_owner(struct nfs4_state_owner *);
...@@ -252,7 +252,7 @@ extern struct nfs4_state * nfs4_get_open_state(struct inode *, struct nfs4_state ...@@ -252,7 +252,7 @@ extern struct nfs4_state * nfs4_get_open_state(struct inode *, struct nfs4_state
extern void nfs4_put_open_state(struct nfs4_state *); extern void nfs4_put_open_state(struct nfs4_state *);
extern void nfs4_close_state(struct nfs4_state *, mode_t); extern void nfs4_close_state(struct nfs4_state *, mode_t);
extern void nfs4_state_set_mode_locked(struct nfs4_state *, mode_t); extern void nfs4_state_set_mode_locked(struct nfs4_state *, mode_t);
extern void nfs4_schedule_state_recovery(struct nfs4_client *); extern void nfs4_schedule_state_recovery(struct nfs_client *);
extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp); extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);
extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl); extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);
extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t); extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t);
......
...@@ -64,7 +64,7 @@ static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinf ...@@ -64,7 +64,7 @@ static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinf
static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *); static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *);
static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry); static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry);
static 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);
static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs4_client *clp); static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs_client *clp);
/* Prevent leaks of NFSv4 errors into userland */ /* Prevent leaks of NFSv4 errors into userland */
int nfs4_map_errors(int err) int nfs4_map_errors(int err)
...@@ -195,7 +195,7 @@ static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, ...@@ -195,7 +195,7 @@ static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
static void renew_lease(const struct nfs_server *server, unsigned long timestamp) static void renew_lease(const struct nfs_server *server, unsigned long timestamp)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
if (time_before(clp->cl_last_renewal,timestamp)) if (time_before(clp->cl_last_renewal,timestamp))
clp->cl_last_renewal = timestamp; clp->cl_last_renewal = timestamp;
...@@ -792,7 +792,7 @@ static int _nfs4_do_access(struct inode *inode, struct rpc_cred *cred, int openf ...@@ -792,7 +792,7 @@ static int _nfs4_do_access(struct inode *inode, struct rpc_cred *cred, int openf
int nfs4_recover_expired_lease(struct nfs_server *server) int nfs4_recover_expired_lease(struct nfs_server *server)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
nfs4_schedule_state_recovery(clp); nfs4_schedule_state_recovery(clp);
...@@ -867,7 +867,7 @@ static int _nfs4_open_delegated(struct inode *inode, int flags, struct rpc_cred ...@@ -867,7 +867,7 @@ static int _nfs4_open_delegated(struct inode *inode, int flags, struct rpc_cred
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs4_state_owner *sp = NULL; struct nfs4_state_owner *sp = NULL;
struct nfs4_state *state = NULL; struct nfs4_state *state = NULL;
...@@ -953,7 +953,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st ...@@ -953,7 +953,7 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, int flags, st
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
struct nfs4_state *state = NULL; struct nfs4_state *state = NULL;
struct nfs_server *server = NFS_SERVER(dir); struct nfs_server *server = NFS_SERVER(dir);
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
struct nfs4_opendata *opendata; struct nfs4_opendata *opendata;
int status; int status;
...@@ -2521,7 +2521,7 @@ static void nfs4_proc_commit_setup(struct nfs_write_data *data, int how) ...@@ -2521,7 +2521,7 @@ static void nfs4_proc_commit_setup(struct nfs_write_data *data, int how)
*/ */
static void nfs4_renew_done(struct rpc_task *task, void *data) static void nfs4_renew_done(struct rpc_task *task, void *data)
{ {
struct nfs4_client *clp = (struct nfs4_client *)task->tk_msg.rpc_argp; struct nfs_client *clp = (struct nfs_client *)task->tk_msg.rpc_argp;
unsigned long timestamp = (unsigned long)data; unsigned long timestamp = (unsigned long)data;
if (task->tk_status < 0) { if (task->tk_status < 0) {
...@@ -2543,7 +2543,7 @@ static const struct rpc_call_ops nfs4_renew_ops = { ...@@ -2543,7 +2543,7 @@ static const struct rpc_call_ops nfs4_renew_ops = {
.rpc_call_done = nfs4_renew_done, .rpc_call_done = nfs4_renew_done,
}; };
int nfs4_proc_async_renew(struct nfs4_client *clp, struct rpc_cred *cred) int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred)
{ {
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW],
...@@ -2555,7 +2555,7 @@ int nfs4_proc_async_renew(struct nfs4_client *clp, struct rpc_cred *cred) ...@@ -2555,7 +2555,7 @@ int nfs4_proc_async_renew(struct nfs4_client *clp, struct rpc_cred *cred)
&nfs4_renew_ops, (void *)jiffies); &nfs4_renew_ops, (void *)jiffies);
} }
int nfs4_proc_renew(struct nfs4_client *clp, struct rpc_cred *cred) int nfs4_proc_renew(struct nfs_client *clp, struct rpc_cred *cred)
{ {
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW],
...@@ -2791,7 +2791,7 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen ...@@ -2791,7 +2791,7 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen
static int static int
nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server) nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
if (!clp || task->tk_status >= 0) if (!clp || task->tk_status >= 0)
return 0; return 0;
...@@ -2828,7 +2828,7 @@ static int nfs4_wait_bit_interruptible(void *word) ...@@ -2828,7 +2828,7 @@ static int nfs4_wait_bit_interruptible(void *word)
return 0; return 0;
} }
static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs4_client *clp) static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs_client *clp)
{ {
sigset_t oldset; sigset_t oldset;
int res; int res;
...@@ -2871,7 +2871,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) ...@@ -2871,7 +2871,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
*/ */
int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception) int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
int ret = errorcode; int ret = errorcode;
exception->retry = 0; exception->retry = 0;
...@@ -2898,7 +2898,7 @@ int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct ...@@ -2898,7 +2898,7 @@ int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct
return nfs4_map_errors(ret); return nfs4_map_errors(ret);
} }
int nfs4_proc_setclientid(struct nfs4_client *clp, u32 program, unsigned short port, struct rpc_cred *cred) int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short port, struct rpc_cred *cred)
{ {
nfs4_verifier sc_verifier; nfs4_verifier sc_verifier;
struct nfs4_setclientid setclientid = { struct nfs4_setclientid setclientid = {
...@@ -2945,7 +2945,7 @@ int nfs4_proc_setclientid(struct nfs4_client *clp, u32 program, unsigned short p ...@@ -2945,7 +2945,7 @@ int nfs4_proc_setclientid(struct nfs4_client *clp, u32 program, unsigned short p
return status; return status;
} }
static int _nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred) static int _nfs4_proc_setclientid_confirm(struct nfs_client *clp, struct rpc_cred *cred)
{ {
struct nfs_fsinfo fsinfo; struct nfs_fsinfo fsinfo;
struct rpc_message msg = { struct rpc_message msg = {
...@@ -2969,7 +2969,7 @@ static int _nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cr ...@@ -2969,7 +2969,7 @@ static int _nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cr
return status; return status;
} }
int nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred) int nfs4_proc_setclientid_confirm(struct nfs_client *clp, struct rpc_cred *cred)
{ {
long timeout; long timeout;
int err; int err;
...@@ -3106,7 +3106,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock ...@@ -3106,7 +3106,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
{ {
struct inode *inode = state->inode; struct inode *inode = state->inode;
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
struct nfs_lockt_args arg = { struct nfs_lockt_args arg = {
.fh = NFS_FH(inode), .fh = NFS_FH(inode),
.fl = request, .fl = request,
...@@ -3513,7 +3513,7 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request ...@@ -3513,7 +3513,7 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request
static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
{ {
struct nfs4_client *clp = state->owner->so_client; struct nfs_client *clp = state->owner->so_client;
unsigned char fl_flags = request->fl_flags; unsigned char fl_flags = request->fl_flags;
int status; int status;
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
void void
nfs4_renew_state(void *data) nfs4_renew_state(void *data)
{ {
struct nfs4_client *clp = (struct nfs4_client *)data; struct nfs_client *clp = (struct nfs_client *)data;
struct rpc_cred *cred; struct rpc_cred *cred;
long lease, timeout; long lease, timeout;
unsigned long last, now; unsigned long last, now;
...@@ -108,7 +108,7 @@ nfs4_renew_state(void *data) ...@@ -108,7 +108,7 @@ nfs4_renew_state(void *data)
/* Must be called with clp->cl_sem locked for writes */ /* Must be called with clp->cl_sem locked for writes */
void void
nfs4_schedule_state_renewal(struct nfs4_client *clp) nfs4_schedule_state_renewal(struct nfs_client *clp)
{ {
long timeout; long timeout;
...@@ -127,7 +127,7 @@ nfs4_schedule_state_renewal(struct nfs4_client *clp) ...@@ -127,7 +127,7 @@ nfs4_schedule_state_renewal(struct nfs4_client *clp)
void void
nfs4_renewd_prepare_shutdown(struct nfs_server *server) nfs4_renewd_prepare_shutdown(struct nfs_server *server)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
if (!clp) if (!clp)
return; return;
...@@ -140,7 +140,7 @@ nfs4_renewd_prepare_shutdown(struct nfs_server *server) ...@@ -140,7 +140,7 @@ nfs4_renewd_prepare_shutdown(struct nfs_server *server)
/* Must be called with clp->cl_sem locked for writes */ /* Must be called with clp->cl_sem locked for writes */
void void
nfs4_kill_renewd(struct nfs4_client *clp) nfs4_kill_renewd(struct nfs_client *clp)
{ {
down_read(&clp->cl_sem); down_read(&clp->cl_sem);
if (!list_empty(&clp->cl_superblocks)) { if (!list_empty(&clp->cl_superblocks)) {
......
...@@ -83,10 +83,10 @@ destroy_nfsv4_state(struct nfs_server *server) ...@@ -83,10 +83,10 @@ destroy_nfsv4_state(struct nfs_server *server)
* Since these are allocated/deallocated very rarely, we don't * Since these are allocated/deallocated very rarely, we don't
* bother putting them in a slab cache... * bother putting them in a slab cache...
*/ */
static struct nfs4_client * static struct nfs_client *
nfs4_alloc_client(struct in_addr *addr) nfs4_alloc_client(struct in_addr *addr)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
if (nfs_callback_up() < 0) if (nfs_callback_up() < 0)
return NULL; return NULL;
...@@ -111,7 +111,7 @@ nfs4_alloc_client(struct in_addr *addr) ...@@ -111,7 +111,7 @@ nfs4_alloc_client(struct in_addr *addr)
} }
static void static void
nfs4_free_client(struct nfs4_client *clp) nfs4_free_client(struct nfs_client *clp)
{ {
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
...@@ -130,9 +130,9 @@ nfs4_free_client(struct nfs4_client *clp) ...@@ -130,9 +130,9 @@ nfs4_free_client(struct nfs4_client *clp)
nfs_callback_down(); nfs_callback_down();
} }
static struct nfs4_client *__nfs4_find_client(struct in_addr *addr) static struct nfs_client *__nfs4_find_client(struct in_addr *addr)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
list_for_each_entry(clp, &nfs4_clientid_list, cl_servers) { list_for_each_entry(clp, &nfs4_clientid_list, cl_servers) {
if (memcmp(&clp->cl_addr, addr, sizeof(clp->cl_addr)) == 0) { if (memcmp(&clp->cl_addr, addr, sizeof(clp->cl_addr)) == 0) {
atomic_inc(&clp->cl_count); atomic_inc(&clp->cl_count);
...@@ -142,19 +142,19 @@ static struct nfs4_client *__nfs4_find_client(struct in_addr *addr) ...@@ -142,19 +142,19 @@ static struct nfs4_client *__nfs4_find_client(struct in_addr *addr)
return NULL; return NULL;
} }
struct nfs4_client *nfs4_find_client(struct in_addr *addr) struct nfs_client *nfs4_find_client(struct in_addr *addr)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
spin_lock(&state_spinlock); spin_lock(&state_spinlock);
clp = __nfs4_find_client(addr); clp = __nfs4_find_client(addr);
spin_unlock(&state_spinlock); spin_unlock(&state_spinlock);
return clp; return clp;
} }
struct nfs4_client * struct nfs_client *
nfs4_get_client(struct in_addr *addr) nfs4_get_client(struct in_addr *addr)
{ {
struct nfs4_client *clp, *new = NULL; struct nfs_client *clp, *new = NULL;
spin_lock(&state_spinlock); spin_lock(&state_spinlock);
for (;;) { for (;;) {
...@@ -180,7 +180,7 @@ nfs4_get_client(struct in_addr *addr) ...@@ -180,7 +180,7 @@ nfs4_get_client(struct in_addr *addr)
} }
void void
nfs4_put_client(struct nfs4_client *clp) nfs4_put_client(struct nfs_client *clp)
{ {
if (!atomic_dec_and_lock(&clp->cl_count, &state_spinlock)) if (!atomic_dec_and_lock(&clp->cl_count, &state_spinlock))
return; return;
...@@ -192,7 +192,7 @@ nfs4_put_client(struct nfs4_client *clp) ...@@ -192,7 +192,7 @@ nfs4_put_client(struct nfs4_client *clp)
nfs4_free_client(clp); nfs4_free_client(clp);
} }
static int nfs4_init_client(struct nfs4_client *clp, struct rpc_cred *cred) static int nfs4_init_client(struct nfs_client *clp, struct rpc_cred *cred)
{ {
int status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, int status = nfs4_proc_setclientid(clp, NFS4_CALLBACK,
nfs_callback_tcpport, cred); nfs_callback_tcpport, cred);
...@@ -204,13 +204,13 @@ static int nfs4_init_client(struct nfs4_client *clp, struct rpc_cred *cred) ...@@ -204,13 +204,13 @@ static int nfs4_init_client(struct nfs4_client *clp, struct rpc_cred *cred)
} }
u32 u32
nfs4_alloc_lockowner_id(struct nfs4_client *clp) nfs4_alloc_lockowner_id(struct nfs_client *clp)
{ {
return clp->cl_lockowner_id ++; return clp->cl_lockowner_id ++;
} }
static struct nfs4_state_owner * static struct nfs4_state_owner *
nfs4_client_grab_unused(struct nfs4_client *clp, struct rpc_cred *cred) nfs4_client_grab_unused(struct nfs_client *clp, struct rpc_cred *cred)
{ {
struct nfs4_state_owner *sp = NULL; struct nfs4_state_owner *sp = NULL;
...@@ -224,7 +224,7 @@ nfs4_client_grab_unused(struct nfs4_client *clp, struct rpc_cred *cred) ...@@ -224,7 +224,7 @@ nfs4_client_grab_unused(struct nfs4_client *clp, struct rpc_cred *cred)
return sp; return sp;
} }
struct rpc_cred *nfs4_get_renew_cred(struct nfs4_client *clp) struct rpc_cred *nfs4_get_renew_cred(struct nfs_client *clp)
{ {
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
struct rpc_cred *cred = NULL; struct rpc_cred *cred = NULL;
...@@ -238,7 +238,7 @@ struct rpc_cred *nfs4_get_renew_cred(struct nfs4_client *clp) ...@@ -238,7 +238,7 @@ struct rpc_cred *nfs4_get_renew_cred(struct nfs4_client *clp)
return cred; return cred;
} }
struct rpc_cred *nfs4_get_setclientid_cred(struct nfs4_client *clp) struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)
{ {
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
...@@ -251,7 +251,7 @@ struct rpc_cred *nfs4_get_setclientid_cred(struct nfs4_client *clp) ...@@ -251,7 +251,7 @@ struct rpc_cred *nfs4_get_setclientid_cred(struct nfs4_client *clp)
} }
static struct nfs4_state_owner * static struct nfs4_state_owner *
nfs4_find_state_owner(struct nfs4_client *clp, struct rpc_cred *cred) nfs4_find_state_owner(struct nfs_client *clp, struct rpc_cred *cred)
{ {
struct nfs4_state_owner *sp, *res = NULL; struct nfs4_state_owner *sp, *res = NULL;
...@@ -294,7 +294,7 @@ nfs4_alloc_state_owner(void) ...@@ -294,7 +294,7 @@ nfs4_alloc_state_owner(void)
void void
nfs4_drop_state_owner(struct nfs4_state_owner *sp) nfs4_drop_state_owner(struct nfs4_state_owner *sp)
{ {
struct nfs4_client *clp = sp->so_client; struct nfs_client *clp = sp->so_client;
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
list_del_init(&sp->so_list); list_del_init(&sp->so_list);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
...@@ -306,7 +306,7 @@ nfs4_drop_state_owner(struct nfs4_state_owner *sp) ...@@ -306,7 +306,7 @@ nfs4_drop_state_owner(struct nfs4_state_owner *sp)
*/ */
struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct rpc_cred *cred) struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct rpc_cred *cred)
{ {
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
struct nfs4_state_owner *sp, *new; struct nfs4_state_owner *sp, *new;
get_rpccred(cred); get_rpccred(cred);
...@@ -337,7 +337,7 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct ...@@ -337,7 +337,7 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
*/ */
void nfs4_put_state_owner(struct nfs4_state_owner *sp) void nfs4_put_state_owner(struct nfs4_state_owner *sp)
{ {
struct nfs4_client *clp = sp->so_client; struct nfs_client *clp = sp->so_client;
struct rpc_cred *cred = sp->so_cred; struct rpc_cred *cred = sp->so_cred;
if (!atomic_dec_and_lock(&sp->so_count, &clp->cl_lock)) if (!atomic_dec_and_lock(&sp->so_count, &clp->cl_lock))
...@@ -540,7 +540,7 @@ __nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t fl_owner) ...@@ -540,7 +540,7 @@ __nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t fl_owner)
static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, fl_owner_t fl_owner) static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, fl_owner_t fl_owner)
{ {
struct nfs4_lock_state *lsp; struct nfs4_lock_state *lsp;
struct nfs4_client *clp = state->owner->so_client; struct nfs_client *clp = state->owner->so_client;
lsp = kzalloc(sizeof(*lsp), GFP_KERNEL); lsp = kzalloc(sizeof(*lsp), GFP_KERNEL);
if (lsp == NULL) if (lsp == NULL)
...@@ -752,7 +752,7 @@ int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task) ...@@ -752,7 +752,7 @@ int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task)
static int reclaimer(void *); static int reclaimer(void *);
static inline void nfs4_clear_recover_bit(struct nfs4_client *clp) static inline void nfs4_clear_recover_bit(struct nfs_client *clp)
{ {
smp_mb__before_clear_bit(); smp_mb__before_clear_bit();
clear_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state); clear_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state);
...@@ -764,7 +764,7 @@ static inline void nfs4_clear_recover_bit(struct nfs4_client *clp) ...@@ -764,7 +764,7 @@ static inline void nfs4_clear_recover_bit(struct nfs4_client *clp)
/* /*
* State recovery routine * State recovery routine
*/ */
static void nfs4_recover_state(struct nfs4_client *clp) static void nfs4_recover_state(struct nfs_client *clp)
{ {
struct task_struct *task; struct task_struct *task;
...@@ -782,7 +782,7 @@ static void nfs4_recover_state(struct nfs4_client *clp) ...@@ -782,7 +782,7 @@ static void nfs4_recover_state(struct nfs4_client *clp)
/* /*
* Schedule a state recovery attempt * Schedule a state recovery attempt
*/ */
void nfs4_schedule_state_recovery(struct nfs4_client *clp) void nfs4_schedule_state_recovery(struct nfs_client *clp)
{ {
if (!clp) if (!clp)
return; return;
...@@ -879,7 +879,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_recovery_ops *ops, struct n ...@@ -879,7 +879,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_recovery_ops *ops, struct n
return status; return status;
} }
static void nfs4_state_mark_reclaim(struct nfs4_client *clp) static void nfs4_state_mark_reclaim(struct nfs_client *clp)
{ {
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
struct nfs4_state *state; struct nfs4_state *state;
...@@ -903,7 +903,7 @@ static void nfs4_state_mark_reclaim(struct nfs4_client *clp) ...@@ -903,7 +903,7 @@ static void nfs4_state_mark_reclaim(struct nfs4_client *clp)
static int reclaimer(void *ptr) static int reclaimer(void *ptr)
{ {
struct nfs4_client *clp = ptr; struct nfs_client *clp = ptr;
struct nfs4_state_owner *sp; struct nfs4_state_owner *sp;
struct nfs4_state_recovery_ops *ops; struct nfs4_state_recovery_ops *ops;
struct rpc_cred *cred; struct rpc_cred *cred;
......
...@@ -1160,7 +1160,7 @@ static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, con ...@@ -1160,7 +1160,7 @@ static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, con
return 0; return 0;
} }
static int encode_renew(struct xdr_stream *xdr, const struct nfs4_client *client_stateid) static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid)
{ {
uint32_t *p; uint32_t *p;
...@@ -1246,7 +1246,7 @@ static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclien ...@@ -1246,7 +1246,7 @@ static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclien
return 0; return 0;
} }
static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs4_client *client_state) static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state)
{ {
uint32_t *p; uint32_t *p;
...@@ -1945,7 +1945,7 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const str ...@@ -1945,7 +1945,7 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const str
/* /*
* a RENEW request * a RENEW request
*/ */
static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs4_client *clp) static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr = { struct compound_hdr hdr = {
...@@ -1975,7 +1975,7 @@ static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nf ...@@ -1975,7 +1975,7 @@ static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nf
/* /*
* a SETCLIENTID_CONFIRM request * a SETCLIENTID_CONFIRM request
*/ */
static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs4_client *clp) static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr = { struct compound_hdr hdr = {
...@@ -2132,7 +2132,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) ...@@ -2132,7 +2132,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
} }
/* Dummy routine */ /* Dummy routine */
static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs4_client *clp) static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp)
{ {
uint32_t *p; uint32_t *p;
unsigned int strlen; unsigned int strlen;
...@@ -2636,7 +2636,7 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t ...@@ -2636,7 +2636,7 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t
return 0; return 0;
} }
static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_client *clp, int32_t *uid) static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid)
{ {
uint32_t len, *p; uint32_t len, *p;
...@@ -2660,7 +2660,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nf ...@@ -2660,7 +2660,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nf
return 0; return 0;
} }
static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_client *clp, int32_t *gid) static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid)
{ {
uint32_t len, *p; uint32_t len, *p;
...@@ -3565,7 +3565,7 @@ static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) ...@@ -3565,7 +3565,7 @@ static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res)
return 0; return 0;
} }
static int decode_setclientid(struct xdr_stream *xdr, struct nfs4_client *clp) static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp)
{ {
uint32_t *p; uint32_t *p;
uint32_t opnum; uint32_t opnum;
...@@ -4335,7 +4335,7 @@ static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy) ...@@ -4335,7 +4335,7 @@ static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy)
* a SETCLIENTID request * a SETCLIENTID request
*/ */
static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p,
struct nfs4_client *clp) struct nfs_client *clp)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
......
...@@ -1099,7 +1099,7 @@ static int nfs_clone_nfs_sb(struct file_system_type *fs_type, ...@@ -1099,7 +1099,7 @@ static int nfs_clone_nfs_sb(struct file_system_type *fs_type,
static struct rpc_clnt *nfs4_create_client(struct nfs_server *server, static struct rpc_clnt *nfs4_create_client(struct nfs_server *server,
struct rpc_timeout *timeparms, int proto, rpc_authflavor_t flavor) struct rpc_timeout *timeparms, int proto, rpc_authflavor_t flavor)
{ {
struct nfs4_client *clp; struct nfs_client *clp;
struct rpc_xprt *xprt = NULL; struct rpc_xprt *xprt = NULL;
struct rpc_clnt *clnt = NULL; struct rpc_clnt *clnt = NULL;
int err = -EIO; int err = -EIO;
...@@ -1416,7 +1416,7 @@ static inline char *nfs4_dup_path(const struct dentry *dentry) ...@@ -1416,7 +1416,7 @@ static inline char *nfs4_dup_path(const struct dentry *dentry)
static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data) static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data)
{ {
const struct dentry *dentry = data->dentry; const struct dentry *dentry = data->dentry;
struct nfs4_client *clp = server->nfs4_state; struct nfs_client *clp = server->nfs4_state;
struct super_block *sb; struct super_block *sb;
server->fsid = data->fattr->fsid; server->fsid = data->fattr->fsid;
......
...@@ -43,7 +43,7 @@ struct nfs_server { ...@@ -43,7 +43,7 @@ struct nfs_server {
*/ */
char ip_addr[16]; char ip_addr[16];
char * mnt_path; char * mnt_path;
struct nfs4_client * nfs4_state; /* all NFSv4 state starts here */ struct nfs_client * nfs4_state; /* all NFSv4 state starts here */
struct list_head nfs4_siblings; /* List of other nfs_server structs struct list_head nfs4_siblings; /* List of other nfs_server structs
* that share the same clientid * that share the same clientid
*/ */
......
...@@ -62,15 +62,15 @@ struct idmap_msg { ...@@ -62,15 +62,15 @@ struct idmap_msg {
#ifdef __KERNEL__ #ifdef __KERNEL__
/* Forward declaration to make this header independent of others */ /* Forward declaration to make this header independent of others */
struct nfs4_client; struct nfs_client;
void nfs_idmap_new(struct nfs4_client *); void nfs_idmap_new(struct nfs_client *);
void nfs_idmap_delete(struct nfs4_client *); void nfs_idmap_delete(struct nfs_client *);
int nfs_map_name_to_uid(struct nfs4_client *, const char *, size_t, __u32 *); int nfs_map_name_to_uid(struct nfs_client *, const char *, size_t, __u32 *);
int nfs_map_group_to_gid(struct nfs4_client *, const char *, size_t, __u32 *); int nfs_map_group_to_gid(struct nfs_client *, const char *, size_t, __u32 *);
int nfs_map_uid_to_name(struct nfs4_client *, __u32, char *); int nfs_map_uid_to_name(struct nfs_client *, __u32, char *);
int nfs_map_gid_to_group(struct nfs4_client *, __u32, char *); int nfs_map_gid_to_group(struct nfs_client *, __u32, char *);
extern unsigned int nfs_idmap_cache_timeout; extern unsigned int nfs_idmap_cache_timeout;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment