fix

diff --git a/ChangeLog b/ChangeLog
index 34a60097762732de83052f7ceb778317deeff5ac..6c8c2ed2eb26f8291059904688ae161bd06e97d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-19  Miklos Szeredi <miklos@szeredi.hu>
+
+       * kernel: add locking to background list (fixes previous fix)
+
 2005-03-18  Miklos Szeredi <miklos@szeredi.hu>
 
        * kernel: fix bug which could cause leave busy inodes after

diff --git a/kernel/dev.c b/kernel/dev.c
index 537c273b67259761ddf9257f9c8f5a0b215fff80..5941035196c3336cc97cbfe2b0b38db8ffa333f8 100644 (file)
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -186,7 +186,9 @@ void fuse_release_background(struct fuse_req *req)
                iput(req->inode2);
        if (req->file)
                fput(req->file);
+       spin_lock(&fuse_lock);
        list_del(&req->bg_entry);
+       spin_unlock(&fuse_lock);
 }
 
 /* Called with fuse_lock, unlocks it */
@@ -362,7 +364,9 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req)
 void request_send_background(struct fuse_conn *fc, struct fuse_req *req)
 {
        req->isreply = 1;
+       spin_lock(&fuse_lock);
        background_request(fc, req);
+       spin_unlock(&fuse_lock);
        request_send_nowait(fc, req);
 }
 

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 0f671f285ddad40d86672eaa6595c6b5e4bb3e13..d8770718f7b66ab8212d1e6214fbf5e3e760dacc 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -371,6 +371,7 @@ extern struct file_operations fuse_dev_operations;
  *  - the private_data field of the device file
  *  - the s_fs_info field of the super block
  *  - unused_list, pending, processing lists in fuse_conn
+ *  - background list in fuse_conn
  *  - the unique request ID counter reqctr in fuse_conn
  *  - the sb (super_block) field in fuse_conn
  *  - the file (device file) field in fuse_conn