From 4c749295c233ceaa91b53c816eb4ad3ccfee4748 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 16 Nov 2001 21:40:00 +0000
Subject: fixes in kernel module

---
 kernel/dev.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'kernel/dev.c')

diff --git a/kernel/dev.c b/kernel/dev.c
index 1cc12a2..d4206e1 100644
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -18,6 +18,26 @@
 static struct proc_dir_entry *proc_fs_fuse;
 struct proc_dir_entry *proc_fuse_dev;
 
+static int interrupt_error(enum fuse_opcode opcode)
+{
+	switch(opcode) {
+	case FUSE_LOOKUP:
+	case FUSE_GETATTR:
+	case FUSE_READLINK:
+	case FUSE_GETDIR:
+	case FUSE_OPEN:
+	case FUSE_READ:
+	case FUSE_WRITE:
+		return -ERESTARTSYS;
+
+	default:
+		/* Operations which modify the filesystem cannot be safely
+                   restarted, because it is uncertain whether the
+                   operation has completed or not... */
+		return -EINTR;
+	}
+}
+
 static int request_wait_answer(struct fuse_req *req)
 {
 	int ret = 0;
@@ -27,7 +47,7 @@ static int request_wait_answer(struct fuse_req *req)
 	while(!list_empty(&req->list)) {
 		set_current_state(TASK_INTERRUPTIBLE);
 		if(signal_pending(current)) {
-			ret = -EINTR;
+			ret = interrupt_error(req->opcode);
 			break;
 		}
 		spin_unlock(&fuse_lock);
-- 
cgit v1.2.3