浏览代码

fuse: cleanup request_end()

Now that we atomically test having already done everything we no longer
need other protection.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
Miklos Szeredi 10 年之前
父节点
当前提交
1e6881c36e
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      fs/fuse/dev.c

+ 2 - 4
fs/fuse/dev.c

@@ -383,14 +383,12 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)
 __releases(fc->lock)
 __releases(fc->lock)
 {
 {
 	struct fuse_iqueue *fiq = &fc->iq;
 	struct fuse_iqueue *fiq = &fc->iq;
-	void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
 
 
 	if (test_and_set_bit(FR_FINISHED, &req->flags)) {
 	if (test_and_set_bit(FR_FINISHED, &req->flags)) {
 		spin_unlock(&fc->lock);
 		spin_unlock(&fc->lock);
 		return;
 		return;
 	}
 	}
 
 
-	req->end = NULL;
 	spin_lock(&fiq->waitq.lock);
 	spin_lock(&fiq->waitq.lock);
 	list_del_init(&req->intr_entry);
 	list_del_init(&req->intr_entry);
 	spin_unlock(&fiq->waitq.lock);
 	spin_unlock(&fiq->waitq.lock);
@@ -416,8 +414,8 @@ __releases(fc->lock)
 	}
 	}
 	spin_unlock(&fc->lock);
 	spin_unlock(&fc->lock);
 	wake_up(&req->waitq);
 	wake_up(&req->waitq);
-	if (end)
-		end(fc, req);
+	if (req->end)
+		req->end(fc, req);
 	fuse_put_request(fc, req);
 	fuse_put_request(fc, req);
 }
 }