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

Commit 17cebf65 authored by NeilBrown's avatar NeilBrown Committed by J. Bruce Fields
Browse files

sunrpc: extract some common sunrpc_cache code from nfsd 



Rather can duplicating this idiom twice, put it in an inline function.
This reduces the usage of 'expiry_time' out side the sunrpc/cache.c
code and thus the impact of a change that is about to be made to that
field.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1132b260

fs/nfsd/export.c

+3 −6
Original line number Diff line number Diff line
@@ -935,10 +935,9 @@ static void exp_fsid_unhash(struct svc_export *exp) 


	ek = exp_get_fsid_key(exp->ex_client, exp->ex_fsid);

	if (!IS_ERR(ek)) {

		ek->h.expiry_time = get_seconds()-1;

		sunrpc_invalidate(&ek->h, &svc_expkey_cache);

		cache_put(&ek->h, &svc_expkey_cache);

	}

	svc_expkey_cache.nextcheck = get_seconds();

}



static int exp_fsid_hash(svc_client *clp, struct svc_export *exp)
@@ -973,10 +972,9 @@ static void exp_unhash(struct svc_export *exp) 


	ek = exp_get_key(exp->ex_client, inode->i_sb->s_dev, inode->i_ino);

	if (!IS_ERR(ek)) {

		ek->h.expiry_time = get_seconds()-1;

		sunrpc_invalidate(&ek->h, &svc_expkey_cache);

		cache_put(&ek->h, &svc_expkey_cache);

	}

	svc_expkey_cache.nextcheck = get_seconds();

}

	

/*
@@ -1097,8 +1095,7 @@ exp_export(struct nfsctl_export *nxp) 
static void

exp_do_unexport(svc_export *unexp)

{

	unexp->h.expiry_time = get_seconds()-1;

	svc_export_cache.nextcheck = get_seconds();

	sunrpc_invalidate(&unexp->h, &svc_export_cache);

	exp_unhash(unexp);

	exp_fsid_unhash(unexp);

}

include/linux/sunrpc/cache.h

+6 −0
Original line number Diff line number Diff line
@@ -228,4 +228,10 @@ static inline time_t get_expiry(char **bpp) 
	return rv;

}



static inline void sunrpc_invalidate(struct cache_head *h,

				     struct cache_detail *detail)

{

	h->expiry_time = get_seconds() - 1;

	detail->nextcheck = get_seconds();

}

#endif /*  _LINUX_SUNRPC_CACHE_H_ */