Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuse: duplicate ->connected in pqueue

Browse Source 
This will allow checking ->connected just with the processing queue lock.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reviewed-by: Ashish Samant <ashish.samant@oracle.com>
This commit is contained in:
Miklos Szeredi 2015-07-01 16:26:04 +02:00
parent 3a2b5b9cd9
commit e96edd94d0
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/fuse/dev.c
View File

@ -1303,7 +1303,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
fuse_copy_finish(cs);
spin_lock(&fc->lock);
clear_bit(FR_LOCKED, &req->flags);
if (!fc->connected) {
if (!fpq->connected) {
request_end(fc, req);
return -ENODEV;
}
@ -1891,7 +1891,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
spin_lock(&fc->lock);
err = -ENOENT;
if (!fc->connected)
if (!fpq->connected)
goto err_unlock;
req = request_find(fpq, oh.unique);
@ -1928,7 +1928,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
spin_lock(&fc->lock);
clear_bit(FR_LOCKED, &req->flags);
if (!fc->connected)
if (!fpq->connected)
err = -ENOENT;
else if (err)
req->out.h.error = -EIO;
@ -2125,6 +2125,7 @@ void fuse_abort_conn(struct fuse_conn *fc)
fc->connected = 0;
fc->blocked = 0;
fuse_set_initialized(fc);
fpq->connected = 0;
list_for_each_entry_safe(req, next, &fpq->io, list) {
req->out.h.error = -ECONNABORTED;
spin_lock(&req->waitq.lock);

3
fs/fuse/fuse_i.h
View File

@ -402,6 +402,9 @@ struct fuse_iqueue {
};
struct fuse_pqueue {
/** Connection established */
unsigned connected;
/** The list of requests being processed */
struct list_head processing;

1
fs/fuse/inode.c
View File

@ -582,6 +582,7 @@ static void fuse_pqueue_init(struct fuse_pqueue *fpq)
memset(fpq, 0, sizeof(struct fuse_pqueue));
INIT_LIST_HEAD(&fpq->processing);
INIT_LIST_HEAD(&fpq->io);
fpq->connected = 1;
}
void fuse_conn_init(struct fuse_conn *fc)