From 7be3e0b914fbb2d2ecfe2984d02bacfd8e762eae Mon Sep 17 00:00:00 2001
From: Jakub Klama <jakub@ixsystems.com>
Date: Wed, 3 Feb 2016 10:02:01 +0100
Subject: [PATCH] Integrate (slightly modified) pull request #1 from ailispaw.

Pull request was originally issued in xhyve
repo: https://github.com/jceel/xhyve/pull/1
---
 backend/fs.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/fs.c b/backend/fs.c
index dfb9b52..e410368 100644
--- a/backend/fs.c
+++ b/backend/fs.c
@@ -536,9 +536,16 @@ fs_remove(void *softc, struct l9p_request *req)
 		return;
 	}
 
-	if (unlink(file->name) != 0) {
-		l9p_respond(req, errno);
-		return;
+	if (S_ISDIR(st.st_mode)) {
+		if (rmdir(file->name) != 0) {
+			l9p_respond(req, errno);
+			return;
+		}
+	} else {
+		if (unlink(file->name) != 0) {
+			l9p_respond(req, errno);
+			return;
+		}
 	}
 
 	l9p_respond(req, 0);
@@ -683,15 +690,8 @@ fs_wstat(void *softc, struct l9p_request *req)
 		}
 	}
 
-	if (l9stat->n_uid != (uid_t)~0) {
-		if (lchown(file->name, l9stat->n_uid, (gid_t)-1) != 0) {
-			l9p_respond(req, errno);
-			return;
-		}
-	}
-
-	if (l9stat->n_gid != (uid_t)~0) {
-		if (lchown(file->name, (uid_t)-1, l9stat->n_gid) != 0) {
+	if (req->lr_conn->lc_version >= L9P_2000U) {
+		if (lchown(file->name, l9stat->n_uid, l9stat->n_gid) != 0) {
 			l9p_respond(req, errno);
 			return;
 		}