diff options
| -rw-r--r-- | fs/nfs/delegation.c | 4 | ||||
| -rw-r--r-- | fs/nfs/inode.c | 1 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 1 |
3 files changed, 0 insertions, 6 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 |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 6d627b92df53..2f77e0c651c8 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -180,7 +180,6 @@ struct nfs_inode { | |||
| 180 | /* NFSv4 state */ | 180 | /* NFSv4 state */ |
| 181 | struct list_head open_states; | 181 | struct list_head open_states; |
| 182 | struct nfs_delegation __rcu *delegation; | 182 | struct nfs_delegation __rcu *delegation; |
| 183 | fmode_t delegation_state; | ||
| 184 | struct rw_semaphore rwsem; | 183 | struct rw_semaphore rwsem; |
| 185 | 184 | ||
| 186 | /* pNFS layout information */ | 185 | /* pNFS layout information */ |
