View | Details | Raw Unified | Return to bug 59739 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/src/sys/kern/vfs_lookup.c (-3 / +7 lines)
Lines 35-41 Link Here
35
 */
35
 */
36
36
37
#include <sys/cdefs.h>
37
#include <sys/cdefs.h>
38
__FBSDID("$FreeBSD$");
38
__FBSDID("$FreeBSD: head/sys/kern/vfs_lookup.c 195939 2009-07-29 07:44:43Z rwatson $");
39
39
40
#include "opt_kdtrace.h"
40
#include "opt_kdtrace.h"
41
#include "opt_ktrace.h"
41
#include "opt_ktrace.h"
Lines 563-570 Link Here
563
			error = ENOTDIR;
563
			error = ENOTDIR;
564
			goto bad;
564
			goto bad;
565
		}
565
		}
566
		if (cnp->cn_nameiop != LOOKUP) {
566
		if (cnp->cn_nameiop != LOOKUP && cnp->cn_nameiop == DELETE) {
567
			error = EISDIR;
567
			error = EBUSY;
568
			goto bad;
569
		}
570
		if (cnp->cn_nameiop != LOOKUP && cnp->cn_nameiop == CREATE) {
571
			error = EEXIST;
568
			goto bad;
572
			goto bad;
569
		}
573
		}
570
		if (wantparent) {
574
		if (wantparent) {

Return to bug 59739