diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-13 21:40:27 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-13 21:40:27 -0500 |
commit | bf40e5561fd288a505d5d8d8bf45eef96fe7253d (patch) | |
tree | aeb831222e3b269fda84a31f7f0fbefabcdcaa90 /fs/nfs | |
parent | f4086a3d789dbe18949862276d83b8f49fce6d2f (diff) |
NFSv4: Kill unused nfs_inode->delegation_state field
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/delegation.c | 4 | ||||
-rw-r--r-- | fs/nfs/inode.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 16b754ee0d09..4464eb06b0b6 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -175,7 +175,6 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, | |||
175 | delegation->cred = get_rpccred(cred); | 175 | delegation->cred = get_rpccred(cred); |
176 | clear_bit(NFS_DELEGATION_NEED_RECLAIM, | 176 | clear_bit(NFS_DELEGATION_NEED_RECLAIM, |
177 | &delegation->flags); | 177 | &delegation->flags); |
178 | NFS_I(inode)->delegation_state = delegation->type; | ||
179 | spin_unlock(&delegation->lock); | 178 | spin_unlock(&delegation->lock); |
180 | put_rpccred(oldcred); | 179 | put_rpccred(oldcred); |
181 | rcu_read_unlock(); | 180 | rcu_read_unlock(); |
@@ -270,7 +269,6 @@ nfs_detach_delegation_locked(struct nfs_inode *nfsi, | |||
270 | set_bit(NFS_DELEGATION_RETURNING, &delegation->flags); | 269 | set_bit(NFS_DELEGATION_RETURNING, &delegation->flags); |
271 | list_del_rcu(&delegation->super_list); | 270 | list_del_rcu(&delegation->super_list); |
272 | delegation->inode = NULL; | 271 | delegation->inode = NULL; |
273 | nfsi->delegation_state = 0; | ||
274 | rcu_assign_pointer(nfsi->delegation, NULL); | 272 | rcu_assign_pointer(nfsi->delegation, NULL); |
275 | spin_unlock(&delegation->lock); | 273 | spin_unlock(&delegation->lock); |
276 | return delegation; | 274 | return delegation; |
@@ -350,7 +348,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct | |||
350 | &delegation->stateid)) { | 348 | &delegation->stateid)) { |
351 | nfs_update_inplace_delegation(old_delegation, | 349 | nfs_update_inplace_delegation(old_delegation, |
352 | delegation); | 350 | delegation); |
353 | nfsi->delegation_state = old_delegation->type; | ||
354 | goto out; | 351 | goto out; |
355 | } | 352 | } |
356 | /* | 353 | /* |
@@ -374,7 +371,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct | |||
374 | goto out; | 371 | goto out; |
375 | } | 372 | } |
376 | list_add_rcu(&delegation->super_list, &server->delegations); | 373 | list_add_rcu(&delegation->super_list, &server->delegations); |
377 | nfsi->delegation_state = delegation->type; | ||
378 | rcu_assign_pointer(nfsi->delegation, delegation); | 374 | rcu_assign_pointer(nfsi->delegation, delegation); |
379 | delegation = NULL; | 375 | delegation = NULL; |
380 | 376 | ||
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index d2398c193bda..e211f975a69a 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1776,7 +1776,6 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi) | |||
1776 | #if IS_ENABLED(CONFIG_NFS_V4) | 1776 | #if IS_ENABLED(CONFIG_NFS_V4) |
1777 | INIT_LIST_HEAD(&nfsi->open_states); | 1777 | INIT_LIST_HEAD(&nfsi->open_states); |
1778 | nfsi->delegation = NULL; | 1778 | nfsi->delegation = NULL; |
1779 | nfsi->delegation_state = 0; | ||
1780 | init_rwsem(&nfsi->rwsem); | 1779 | init_rwsem(&nfsi->rwsem); |
1781 | nfsi->layout = NULL; | 1780 | nfsi->layout = NULL; |
1782 | #endif | 1781 | #endif |