diff options
Diffstat (limited to 'fs/nfs/delegation.c')
-rw-r--r-- | fs/nfs/delegation.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index da5433230bb1..a1f0685b42ff 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -180,7 +180,6 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, | |||
180 | delegation->cred = get_rpccred(cred); | 180 | delegation->cred = get_rpccred(cred); |
181 | clear_bit(NFS_DELEGATION_NEED_RECLAIM, | 181 | clear_bit(NFS_DELEGATION_NEED_RECLAIM, |
182 | &delegation->flags); | 182 | &delegation->flags); |
183 | NFS_I(inode)->delegation_state = delegation->type; | ||
184 | spin_unlock(&delegation->lock); | 183 | spin_unlock(&delegation->lock); |
185 | put_rpccred(oldcred); | 184 | put_rpccred(oldcred); |
186 | rcu_read_unlock(); | 185 | rcu_read_unlock(); |
@@ -275,7 +274,6 @@ nfs_detach_delegation_locked(struct nfs_inode *nfsi, | |||
275 | set_bit(NFS_DELEGATION_RETURNING, &delegation->flags); | 274 | set_bit(NFS_DELEGATION_RETURNING, &delegation->flags); |
276 | list_del_rcu(&delegation->super_list); | 275 | list_del_rcu(&delegation->super_list); |
277 | delegation->inode = NULL; | 276 | delegation->inode = NULL; |
278 | nfsi->delegation_state = 0; | ||
279 | rcu_assign_pointer(nfsi->delegation, NULL); | 277 | rcu_assign_pointer(nfsi->delegation, NULL); |
280 | spin_unlock(&delegation->lock); | 278 | spin_unlock(&delegation->lock); |
281 | return delegation; | 279 | return delegation; |
@@ -355,7 +353,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct | |||
355 | &delegation->stateid)) { | 353 | &delegation->stateid)) { |
356 | nfs_update_inplace_delegation(old_delegation, | 354 | nfs_update_inplace_delegation(old_delegation, |
357 | delegation); | 355 | delegation); |
358 | nfsi->delegation_state = old_delegation->type; | ||
359 | goto out; | 356 | goto out; |
360 | } | 357 | } |
361 | /* | 358 | /* |
@@ -379,7 +376,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct | |||
379 | goto out; | 376 | goto out; |
380 | } | 377 | } |
381 | list_add_rcu(&delegation->super_list, &server->delegations); | 378 | list_add_rcu(&delegation->super_list, &server->delegations); |
382 | nfsi->delegation_state = delegation->type; | ||
383 | rcu_assign_pointer(nfsi->delegation, delegation); | 379 | rcu_assign_pointer(nfsi->delegation, delegation); |
384 | delegation = NULL; | 380 | delegation = NULL; |
385 | 381 | ||