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

Commit 826e0013 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix CB_RECALL_ANY to only return delegations that are not in use 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b02ba0b6

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ __be32 nfs4_callback_recallany(struct cb_recallanyargs *args, void *dummy, 
		     &args->craa_type_mask))

		pnfs_recall_all_layouts(cps->clp);

	if (flags)

		nfs_expire_all_delegation_types(cps->clp, flags);

		nfs_expire_unused_delegation_types(cps->clp, flags);

out:

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;

fs/nfs/delegation.c

+7 −7
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ void nfs_server_return_all_delegations(struct nfs_server *server) 
	}

}



static void nfs_mark_return_all_delegation_types(struct nfs_server *server,

static void nfs_mark_return_unused_delegation_types(struct nfs_server *server,

						 fmode_t flags)

{

	struct nfs_delegation *delegation;
@@ -573,18 +573,18 @@ static void nfs_mark_return_all_delegation_types(struct nfs_server *server, 
		if ((delegation->type == (FMODE_READ|FMODE_WRITE)) && !(flags & FMODE_WRITE))

			continue;

		if (delegation->type & flags)

			nfs_mark_return_delegation(server, delegation);

			nfs_mark_return_if_closed_delegation(server, delegation);

	}

}



static void nfs_client_mark_return_all_delegation_types(struct nfs_client *clp,

static void nfs_client_mark_return_unused_delegation_types(struct nfs_client *clp,

							fmode_t flags)

{

	struct nfs_server *server;



	rcu_read_lock();

	list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link)

		nfs_mark_return_all_delegation_types(server, flags);

		nfs_mark_return_unused_delegation_types(server, flags);

	rcu_read_unlock();

}
@@ -601,14 +601,14 @@ void nfs_remove_bad_delegation(struct inode *inode) 
EXPORT_SYMBOL_GPL(nfs_remove_bad_delegation);



/**

 * nfs_expire_all_delegation_types

 * nfs_expire_unused_delegation_types

 * @clp: client to process

 * @flags: delegation types to expire

 *

 */

void nfs_expire_all_delegation_types(struct nfs_client *clp, fmode_t flags)

void nfs_expire_unused_delegation_types(struct nfs_client *clp, fmode_t flags)

{

	nfs_client_mark_return_all_delegation_types(clp, flags);

	nfs_client_mark_return_unused_delegation_types(clp, flags);

	nfs_delegation_run_state_manager(clp);

}

fs/nfs/delegation.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void nfs_inode_return_delegation_noreclaim(struct inode *inode); 
struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle);

void nfs_server_return_all_delegations(struct nfs_server *);

void nfs_expire_all_delegations(struct nfs_client *clp);

void nfs_expire_all_delegation_types(struct nfs_client *clp, fmode_t flags);

void nfs_expire_unused_delegation_types(struct nfs_client *clp, fmode_t flags);

void nfs_expire_unreferenced_delegations(struct nfs_client *clp);

int nfs_client_return_marked_delegations(struct nfs_client *clp);

int nfs_delegations_present(struct nfs_client *clp);