diff options
Diffstat (limited to 'fs/nfs/delegation.c')
-rw-r--r-- | fs/nfs/delegation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 5a1105c258bd..cfe239736ac0 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -52,7 +52,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ | |||
52 | case -NFS4ERR_EXPIRED: | 52 | case -NFS4ERR_EXPIRED: |
53 | /* kill_proc(fl->fl_pid, SIGLOST, 1); */ | 53 | /* kill_proc(fl->fl_pid, SIGLOST, 1); */ |
54 | case -NFS4ERR_STALE_CLIENTID: | 54 | case -NFS4ERR_STALE_CLIENTID: |
55 | nfs4_schedule_state_recovery(NFS_SERVER(inode)->nfs4_state); | 55 | nfs4_schedule_state_recovery(NFS_SERVER(inode)->nfs_client); |
56 | goto out_err; | 56 | goto out_err; |
57 | } | 57 | } |
58 | } | 58 | } |
@@ -114,7 +114,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, st | |||
114 | */ | 114 | */ |
115 | int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res) | 115 | int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res) |
116 | { | 116 | { |
117 | struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state; | 117 | struct nfs_client *clp = NFS_SERVER(inode)->nfs_client; |
118 | struct nfs_inode *nfsi = NFS_I(inode); | 118 | struct nfs_inode *nfsi = NFS_I(inode); |
119 | struct nfs_delegation *delegation; | 119 | struct nfs_delegation *delegation; |
120 | int status = 0; | 120 | int status = 0; |
@@ -176,7 +176,7 @@ static void nfs_msync_inode(struct inode *inode) | |||
176 | */ | 176 | */ |
177 | int __nfs_inode_return_delegation(struct inode *inode) | 177 | int __nfs_inode_return_delegation(struct inode *inode) |
178 | { | 178 | { |
179 | struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state; | 179 | struct nfs_client *clp = NFS_SERVER(inode)->nfs_client; |
180 | struct nfs_inode *nfsi = NFS_I(inode); | 180 | struct nfs_inode *nfsi = NFS_I(inode); |
181 | struct nfs_delegation *delegation; | 181 | struct nfs_delegation *delegation; |
182 | int res = 0; | 182 | int res = 0; |
@@ -208,7 +208,7 @@ int __nfs_inode_return_delegation(struct inode *inode) | |||
208 | */ | 208 | */ |
209 | void nfs_return_all_delegations(struct super_block *sb) | 209 | void nfs_return_all_delegations(struct super_block *sb) |
210 | { | 210 | { |
211 | struct nfs_client *clp = NFS_SB(sb)->nfs4_state; | 211 | struct nfs_client *clp = NFS_SB(sb)->nfs_client; |
212 | struct nfs_delegation *delegation; | 212 | struct nfs_delegation *delegation; |
213 | struct inode *inode; | 213 | struct inode *inode; |
214 | 214 | ||
@@ -310,7 +310,7 @@ static int recall_thread(void *data) | |||
310 | { | 310 | { |
311 | struct recall_threadargs *args = (struct recall_threadargs *)data; | 311 | struct recall_threadargs *args = (struct recall_threadargs *)data; |
312 | struct inode *inode = igrab(args->inode); | 312 | struct inode *inode = igrab(args->inode); |
313 | struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state; | 313 | struct nfs_client *clp = NFS_SERVER(inode)->nfs_client; |
314 | struct nfs_inode *nfsi = NFS_I(inode); | 314 | struct nfs_inode *nfsi = NFS_I(inode); |
315 | struct nfs_delegation *delegation; | 315 | struct nfs_delegation *delegation; |
316 | 316 | ||
@@ -423,7 +423,7 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp) | |||
423 | 423 | ||
424 | int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode) | 424 | int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode) |
425 | { | 425 | { |
426 | struct nfs_client *clp = NFS_SERVER(inode)->nfs4_state; | 426 | struct nfs_client *clp = NFS_SERVER(inode)->nfs_client; |
427 | struct nfs_inode *nfsi = NFS_I(inode); | 427 | struct nfs_inode *nfsi = NFS_I(inode); |
428 | struct nfs_delegation *delegation; | 428 | struct nfs_delegation *delegation; |
429 | int res = 0; | 429 | int res = 0; |