Page MenuHomeFreeBSD
Files F136679562

D9009.id23488.diff
No OneTemporary
Actions

D9009.id23488.diff
View Options

Index: sys/fs/nfsserver/nfs_nfsdport.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdport.c
+++ sys/fs/nfsserver/nfs_nfsdport.c
@@ -2027,17 +2027,22 @@
* a VFS_VGET() for "." or "..".
*/
if (is_zfs == 1) {
+#if 1
+ usevget = 0;
+#else
r = VFS_VGET(mp, at.na_fileid, LK_SHARED, &nvp);
- if (r == EOPNOTSUPP) {
+ if (r == EOPNOTSUPP)
usevget = 0;
- cn.cn_nameiop = LOOKUP;
- cn.cn_lkflags = LK_SHARED | LK_RETRY;
- cn.cn_cred = nd->nd_cred;
- cn.cn_thread = p;
- } else if (r == 0)
+ else if (r == 0)
vput(nvp);
+#endif
}
+ cn.cn_nameiop = LOOKUP;
+ cn.cn_lkflags = LK_SHARED | LK_RETRY;
+ cn.cn_cred = nd->nd_cred;
+ cn.cn_thread = p;
+
/*
* Save this position, in case there is an error before one entry
* is created.
@@ -2105,16 +2110,7 @@
else
r = EOPNOTSUPP;
if (r == EOPNOTSUPP) {
- if (usevget) {
- usevget = 0;
- cn.cn_nameiop = LOOKUP;
- cn.cn_lkflags =
- LK_SHARED |
- LK_RETRY;
- cn.cn_cred =
- nd->nd_cred;
- cn.cn_thread = p;
- }
+ usevget = 0;
cn.cn_nameptr = dp->d_name;
cn.cn_namelen = nlen;
cn.cn_flags = ISLASTCN |

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 9:05 PM (15 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25677606
Default Alt Text
D9009.id23488.diff (1 KB)

Event Timeline