Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf40e556 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Kill unused nfs_inode->delegation_state field 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f4086a3d

fs/nfs/delegation.c

+0 −4
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, 
			delegation->cred = get_rpccred(cred);

			clear_bit(NFS_DELEGATION_NEED_RECLAIM,

				  &delegation->flags);

			NFS_I(inode)->delegation_state = delegation->type;

			spin_unlock(&delegation->lock);

			put_rpccred(oldcred);

			rcu_read_unlock();
@@ -270,7 +269,6 @@ nfs_detach_delegation_locked(struct nfs_inode *nfsi, 
	set_bit(NFS_DELEGATION_RETURNING, &delegation->flags);

	list_del_rcu(&delegation->super_list);

	delegation->inode = NULL;

	nfsi->delegation_state = 0;

	rcu_assign_pointer(nfsi->delegation, NULL);

	spin_unlock(&delegation->lock);

	return delegation;
@@ -350,7 +348,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct 
					&delegation->stateid)) {

			nfs_update_inplace_delegation(old_delegation,

					delegation);

			nfsi->delegation_state = old_delegation->type;

			goto out;

		}

		/*
@@ -374,7 +371,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct 
			goto out;

	}

	list_add_rcu(&delegation->super_list, &server->delegations);

	nfsi->delegation_state = delegation->type;

	rcu_assign_pointer(nfsi->delegation, delegation);

	delegation = NULL;

fs/nfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,6 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi) 
#if IS_ENABLED(CONFIG_NFS_V4)

	INIT_LIST_HEAD(&nfsi->open_states);

	nfsi->delegation = NULL;

	nfsi->delegation_state = 0;

	init_rwsem(&nfsi->rwsem);

	nfsi->layout = NULL;

#endif

include/linux/nfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ struct nfs_inode { 
        /* NFSv4 state */

	struct list_head	open_states;

	struct nfs_delegation __rcu *delegation;

	fmode_t			 delegation_state;

	struct rw_semaphore	rwsem;



	/* pNFS layout information */