[src/netbsd-6]: src/lib/libperfuse Pull up following revision(s) (requested b...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c591a85cce6f
branches:  netbsd-6
changeset: 776750:c591a85cce6f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Nov 03 19:40:10 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1148):
        lib/libperfuse/ops.c: revision 1.73
rmdir dir/.. must return an error. Use ENOTEMPTY like FFS does.

diffstat:

 lib/libperfuse/ops.c |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 2e5968c2f6ed -r c591a85cce6f lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Mon Nov 03 19:37:58 2014 +0000
+++ b/lib/libperfuse/ops.c      Mon Nov 03 19:40:10 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.50.2.10 2014/11/03 19:37:58 msaitoh Exp $ */
+/*  $NetBSD: ops.c,v 1.50.2.11 2014/11/03 19:40:10 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2342,6 +2342,12 @@
            (PERFUSE_NODE_DATA(targ)->pnd_flags & PND_REMOVED))
                return ENOENT;
 
+       /*
+        * Attempt to rmdir dir/.. shoud raise ENOTEMPTY
+        */
+       if (PERFUSE_NODE_DATA(targ)->pnd_nodeid == pnd->pnd_parent_nodeid)
+               return ENOTEMPTY;
+
        node_ref(opc);
        node_ref(targ);