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

Retire the NFS access cache timestamp structure. It was used in VOP_OPEN()

Browse Source 
to avoid sending multiple ACCESS/GETATTR RPCs during a single open()
between VOP_LOOKUP() and VOP_OPEN().  Now we always send the RPC in
VOP_LOOKUP() and not VOP_OPEN() in the cases that multiple RPCs could be
sent.

MFC after:	2 weeks
This commit is contained in:
John Baldwin 2010-07-15 19:40:48 +00:00
parent f9b1a4a3b6
commit 3c497facfb
4 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/fs/nfsclient/nfs_clport.c
View File

@ -340,7 +340,6 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvattr *nap, void *nvaper,
struct nfsnode *np;
struct nfsmount *nmp;
struct timespec mtime_save;
struct thread *td = curthread;
/*
* If v_type == VNON it is a new node, so fill in the v_type,
@ -386,14 +385,6 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvattr *nap, void *nvaper,
else
vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0];
np->n_attrstamp = time_second;
/* Timestamp the NFS otw getattr fetch */
if (td->td_proc) {
np->n_ac_ts_tid = td->td_tid;
np->n_ac_ts_pid = td->td_proc->p_pid;
np->n_ac_ts_syscalls = td->td_syscalls;
} else
bzero(&np->n_ac_ts, sizeof(struct nfs_attrcache_timestamp));
if (vap->va_size != np->n_size) {
if (vap->va_type == VREG) {
if (dontshrink && vap->va_size < np->n_size) {

11
sys/fs/nfsclient/nfsnode.h
View File

@ -68,16 +68,6 @@ struct nfsdmap {
#define ndm_cookies ndm_un1.ndmu3_cookies
#define ndm4_cookies ndm_un1.ndmu4_cookies
#define n_ac_ts_tid n_ac_ts.nfs_ac_ts_tid
#define n_ac_ts_pid n_ac_ts.nfs_ac_ts_pid
#define n_ac_ts_syscalls n_ac_ts.nfs_ac_ts_syscalls
struct nfs_attrcache_timestamp {
lwpid_t nfs_ac_ts_tid;
pid_t nfs_ac_ts_pid;
unsigned long nfs_ac_ts_syscalls;
};
struct nfs_accesscache {
u_int32_t mode; /* ACCESS mode cache */
uid_t uid; /* credentials having mode */
@ -132,7 +122,6 @@ struct nfsnode {
u_int32_t n_flag; /* Flag for locking.. */
int n_directio_opens;
int n_directio_asyncwr;
struct nfs_attrcache_timestamp n_ac_ts;
u_int64_t n_change; /* old Change attribute */
struct nfsv4node *n_v4; /* extra V4 stuff */
};

9
sys/nfsclient/nfs_subs.c
View File

@ -470,7 +470,6 @@ nfs_loadattrcache(struct vnode **vpp, struct mbuf **mdp, caddr_t *dposp,
u_short vmode;
struct timespec mtime, mtime_save;
int v3 = NFS_ISV3(vp);
struct thread *td = curthread;
int error = 0;
md = *mdp;
@ -574,14 +573,6 @@ nfs_loadattrcache(struct vnode **vpp, struct mbuf **mdp, caddr_t *dposp,
vap->va_filerev = 0;
}
np->n_attrstamp = time_second;
/* Timestamp the NFS otw getattr fetch */
if (td->td_proc) {
np->n_ac_ts_tid = td->td_tid;
np->n_ac_ts_pid = td->td_proc->p_pid;
np->n_ac_ts_syscalls = td->td_syscalls;
} else
bzero(&np->n_ac_ts, sizeof(struct nfs_attrcache_timestamp));
if (vap->va_size != np->n_size) {
if (vap->va_type == VREG) {
if (dontshrink && vap->va_size < np->n_size) {

11
sys/nfsclient/nfsnode.h
View File

@ -74,16 +74,6 @@ struct nfsdmap {
#define ndm_cookies ndm_un1.ndmu3_cookies
#define ndm4_cookies ndm_un1.ndmu4_cookies
#define n_ac_ts_tid n_ac_ts.nfs_ac_ts_tid
#define n_ac_ts_pid n_ac_ts.nfs_ac_ts_pid
#define n_ac_ts_syscalls n_ac_ts.nfs_ac_ts_syscalls
struct nfs_attrcache_timestamp {
lwpid_t nfs_ac_ts_tid;
pid_t nfs_ac_ts_pid;
unsigned long nfs_ac_ts_syscalls;
};
struct nfs_accesscache {
u_int32_t mode; /* ACCESS mode cache */
uid_t uid; /* credentials having mode */
@ -140,7 +130,6 @@ struct nfsnode {
uint32_t n_namelen;
int n_directio_opens;
int n_directio_asyncwr;
struct nfs_attrcache_timestamp n_ac_ts;
};
#define n_atim n_un1.nf_atim