d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the nfscl_mustflush() function in the experimental NFSv4

Browse Source 
client to return a boolean_t in order to make it more compatible
with style(9).

MFC after:	2 weeks
This commit is contained in:
rmacklem 2010-07-18 00:24:01 +00:00
parent 7ddfd4597e
commit 7520b52ca5
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/nfs/nfs_var.h
View File

@ -467,7 +467,7 @@ void nfscl_docb(struct nfsrv_descript *, NFSPROC_T *);
void nfscl_releasealllocks(struct nfsclclient *, vnode_t, NFSPROC_T *);
int nfscl_lockt(vnode_t, struct nfsclclient *, u_int64_t,
u_int64_t, struct flock *, NFSPROC_T *);
int nfscl_mustflush(vnode_t);
boolean_t nfscl_mustflush(vnode_t);
int nfscl_nodeleg(vnode_t, int);
int nfscl_removedeleg(vnode_t, NFSPROC_T *, nfsv4stateid_t *);
int nfscl_getref(struct nfsmount *);

10
sys/fs/nfsclient/nfs_clstate.c
View File

@ -3735,7 +3735,7 @@ nfscl_tryclose(struct nfsclopen *op, struct ucred *cred,
* to the server. This might be a big performance win in some environments.
* (Not useful until the client does caching on local stable storage.)
*/
APPLESTATIC int
APPLESTATIC boolean_t
nfscl_mustflush(vnode_t vp)
{
struct nfsclclient *clp;
@ -3746,12 +3746,12 @@ nfscl_mustflush(vnode_t vp)
np = VTONFS(vp);
nmp = VFSTONFS(vnode_mount(vp));
if (!NFSHASNFSV4(nmp))
return (1);
return (TRUE);
NFSLOCKCLSTATE();
clp = nfscl_findcl(nmp);
if (clp == NULL) {
NFSUNLOCKCLSTATE();
return (1);
return (TRUE);
}
dp = nfscl_finddeleg(clp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len);
if (dp != NULL && (dp->nfsdl_flags & (NFSCLDL_WRITE | NFSCLDL_RECALL))
@ -3759,10 +3759,10 @@ nfscl_mustflush(vnode_t vp)
(dp->nfsdl_sizelimit >= np->n_size ||
!NFSHASSTRICT3530(nmp))) {
NFSUNLOCKCLSTATE();
return (0);
return (FALSE);
}
NFSUNLOCKCLSTATE();
return (1);
return (TRUE);
}
/*

5
sys/fs/nfsclient/nfs_clsubs.c
View File

@ -188,7 +188,8 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper)
struct nfsnode *np;
struct vattr *vap;
struct nfsmount *nmp;
int timeo, mustflush;
int timeo;
boolean_t mustflush;
np = VTONFS(vp);
vap = &np->n_vattr.na_vattr;
@ -230,7 +231,7 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper)
#endif
if ((time_second - np->n_attrstamp) >= timeo &&
(mustflush != 0 || np->n_attrstamp == 0)) {
(mustflush || np->n_attrstamp == 0)) {
newnfsstats.attrcache_misses++;
mtx_unlock(&np->n_mtx);
#ifdef NFS_ACDEBUG