diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-03-12 09:05:43 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-03-12 09:05:43 +0000 |
| commit | 2a5a08cb3895d27cb6c2f3db4747702e0df6ec44 (patch) | |
| tree | e30639ecf879b2eb81110c5cf73328f3a87c516a /sys/kern/vfs_lookup.c | |
| parent | f69db55151eef15d495a77803fecd7947cfa8a37 (diff) | |
| download | src-2a5a08cb3895d27cb6c2f3db4747702e0df6ec44.tar.gz src-2a5a08cb3895d27cb6c2f3db4747702e0df6ec44.zip | |
Refactor the way we restore cn_lkflags; no functional changes.
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=296717
Diffstat (limited to 'sys/kern/vfs_lookup.c')
| -rw-r--r-- | sys/kern/vfs_lookup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 06060b38725a..f4b0596eb233 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -726,8 +726,9 @@ unionlookup: lkflags_save = cnp->cn_lkflags; cnp->cn_lkflags = compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags, cnp->cn_flags); - if ((error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp)) != 0) { - cnp->cn_lkflags = lkflags_save; + error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp); + cnp->cn_lkflags = lkflags_save; + if (error != 0) { KASSERT(ndp->ni_vp == NULL, ("leaf should be empty")); #ifdef NAMEI_DIAGNOSTIC printf("not found\n"); @@ -783,8 +784,7 @@ unionlookup: VREF(ndp->ni_startdir); } goto success; - } else - cnp->cn_lkflags = lkflags_save; + } good: #ifdef NAMEI_DIAGNOSTIC |