Page MenuHomeFreeBSD
Files F151348582

D34470.id103595.diff
No OneTemporary
Actions

D34470.id103595.diff
View Options

Index: sys/fs/nfsserver/nfs_nfsdport.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdport.c
+++ sys/fs/nfsserver/nfs_nfsdport.c
@@ -4195,7 +4195,7 @@
int error;
NFSNAMEICNDSET(&named.ni_cnd, tcred, CREATE,
- LOCKPARENT | LOCKLEAF | SAVESTART | NOCACHE);
+ LOCKPARENT | LOCKLEAF | SAVENAME | NOCACHE);
nfsvno_setpathbuf(&named, &bufp, &hashp);
named.ni_cnd.cn_lkflags = LK_EXCLUSIVE;
named.ni_cnd.cn_nameptr = bufp;
Index: sys/fs/nfsserver/nfs_nfsdserv.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdserv.c
+++ sys/fs/nfsserver/nfs_nfsdserv.c
@@ -611,7 +611,7 @@
}
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP,
- LOCKLEAF | SAVESTART);
+ LOCKLEAF | SAVENAME);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (error) {
@@ -1160,7 +1160,7 @@
goto out;
}
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, CREATE,
- LOCKPARENT | LOCKLEAF | SAVESTART | NOCACHE);
+ LOCKPARENT | LOCKLEAF | SAVENAME | NOCACHE);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (error)
@@ -1325,7 +1325,7 @@
struct thread *p = curthread;
NFSVNO_ATTRINIT(&nva);
- cnflags = (LOCKPARENT | SAVESTART);
+ cnflags = (LOCKPARENT | SAVENAME);
if (nd->nd_repstat) {
nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft);
goto out;
@@ -1633,7 +1633,7 @@
fdirfor_ret = nfsvno_getattr(dp, &fdirfor, nd, p, 1, NULL);
tond.ni_cnd.cn_nameiop = 0;
tond.ni_startdir = NULL;
- NFSNAMEICNDSET(&fromnd.ni_cnd, nd->nd_cred, DELETE, WANTPARENT | SAVESTART);
+ NFSNAMEICNDSET(&fromnd.ni_cnd, nd->nd_cred, DELETE, WANTPARENT | SAVENAME);
nfsvno_setpathbuf(&fromnd, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &fromnd.ni_pathlen);
if (error) {
@@ -1694,7 +1694,7 @@
}
}
}
- NFSNAMEICNDSET(&tond.ni_cnd, nd->nd_cred, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART);
+ NFSNAMEICNDSET(&tond.ni_cnd, nd->nd_cred, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVENAME);
nfsvno_setpathbuf(&tond, &tbufp, &hashp);
if (!nd->nd_repstat) {
error = nfsrv_parsename(nd, tbufp, hashp, &tond.ni_pathlen);
@@ -1901,7 +1901,7 @@
*vpp = NULL;
NFSVNO_ATTRINIT(&nva);
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, CREATE,
- LOCKPARENT | SAVESTART | NOCACHE);
+ LOCKPARENT | SAVENAME | NOCACHE);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (!error && !nd->nd_repstat)
@@ -3020,10 +3020,10 @@
}
if (create == NFSV4OPEN_CREATE)
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, CREATE,
- LOCKPARENT | LOCKLEAF | SAVESTART | NOCACHE);
+ LOCKPARENT | LOCKLEAF | SAVENAME | NOCACHE);
else
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP,
- LOCKLEAF | SAVESTART);
+ LOCKLEAF | SAVENAME);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (error) {
@@ -3689,7 +3689,7 @@
* All this just to get the export flags for the name.
*/
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP,
- LOCKLEAF | SAVESTART);
+ LOCKLEAF | SAVENAME);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (error) {
@@ -3823,7 +3823,7 @@
switch (fhstyle) {
case NFSSECINFONONAME_PARENT:
NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP,
- LOCKLEAF | SAVESTART);
+ LOCKLEAF | SAVENAME);
nfsvno_setpathbuf(&named, &bufp, &hashp);
error = nfsrv_parsename(nd, bufp, hashp, &named.ni_pathlen);
if (error != 0) {

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 7:18 PM (19 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31111970
Default Alt Text
D34470.id103595.diff (3 KB)

Event Timeline