diff options
| author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-08-27 18:29:56 +0300 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2018-09-28 16:43:23 +0200 |
| commit | 63825b4e1da5a3cba79d835a5925e5daf7db3a77 (patch) | |
| tree | 55581224599445dbb52801e50273cb3071f700a8 /fs/fuse/file.c | |
| parent | ae2dffa39485c6fd4f22321814c7287c274b473a (diff) | |
fuse: do not take fc->lock in fuse_request_send_background()
Currently, we take fc->lock there only to check for fc->connected.
But this flag is changed only on connection abort, which is very
rare operation.
So allow checking fc->connected under just fc->bg_lock and use this lock
(as well as fc->lock) when resetting fc->connected.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/file.c')
| -rw-r--r-- | fs/fuse/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 65351d43c2b6..d15c14912e72 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1487,6 +1487,7 @@ __acquires(fc->lock) struct fuse_inode *fi = get_fuse_inode(req->inode); struct fuse_write_in *inarg = &req->misc.write.in; __u64 data_size = req->num_pages * PAGE_SIZE; + bool queued; if (!fc->connected) goto out_free; @@ -1502,7 +1503,8 @@ __acquires(fc->lock) req->in.args[1].size = inarg->size; fi->writectr++; - fuse_request_send_background_nocheck(fc, req); + queued = fuse_request_queue_background(fc, req); + WARN_ON(!queued); return; out_free: |