Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/ad-namecache]: src/sys/kern lookup_fastforward(): bail out on mount -o u...



details:   https://anonhg.NetBSD.org/src/rev/607b50922641
branches:  ad-namecache
changeset: 850560:607b50922641
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Mar 03 22:30:57 2020 +0000

description:
lookup_fastforward(): bail out on mount -o union

diffstat:

 sys/kern/vfs_lookup.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 5b355c8f0abb -r 607b50922641 sys/kern/vfs_lookup.c
--- a/sys/kern/vfs_lookup.c     Sat Feb 29 22:00:03 2020 +0000
+++ b/sys/kern/vfs_lookup.c     Tue Mar 03 22:30:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_lookup.c,v 1.212.4.10 2020/02/29 20:21:03 ad Exp $ */
+/*     $NetBSD: vfs_lookup.c,v 1.212.4.11 2020/03/03 22:30:57 ad Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.212.4.10 2020/02/29 20:21:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.212.4.11 2020/03/03 22:30:57 ad Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_magiclinks.h"
@@ -1308,6 +1308,13 @@
                        }
                }
 
+               /* Can't deal with -o union lookups. */
+               if ((searchdir->v_vflag & VV_ROOT) != 0 &&
+                   (searchdir->v_mount->mnt_flag & MNT_UNION) != 0) {
+                       error = EOPNOTSUPP;
+                       break;
+               }
+
                /*
                 * Good, now look for it in cache.  cache_lookup_linked()
                 * will fail if there's nothing there, or if there's no
@@ -1323,7 +1330,6 @@
 
                /* Scored a hit.  Negative is good too (ENOENT). */
                if (foundobj == NULL) {
-                       /* XXXAD need to handle -o union mount. */
                        error = ENOENT;
                        break;
                }



Home | Main Index | Thread Index | Old Index