diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2019-01-24 10:40:16 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2019-02-13 13:15:14 +0100 |
| commit | eb98e3bdf3aa7b15b40c65063ea935f953f60c6b (patch) | |
| tree | e4f78c73977fc0cc761e56c901b14d25d671dbd6 /fs/fuse/control.c | |
| parent | 6b675738ce900dac8f8478b1d8487df420a315f3 (diff) | |
| download | blackbird-op-linux-eb98e3bdf3aa7b15b40c65063ea935f953f60c6b.tar.gz blackbird-op-linux-eb98e3bdf3aa7b15b40c65063ea935f953f60c6b.zip | |
fuse: clean up aborted
The only caller that needs fc->aborted set is fuse_conn_abort_write().
Setting fc->aborted is now racy (fuse_abort_conn() may already be in
progress or finished) but there's no reason to care.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/control.c')
| -rw-r--r-- | fs/fuse/control.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index 989df5accaee..fe80bea4ad89 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -35,7 +35,9 @@ static ssize_t fuse_conn_abort_write(struct file *file, const char __user *buf, { struct fuse_conn *fc = fuse_ctl_file_conn_get(file); if (fc) { - fuse_abort_conn(fc, true); + if (fc->abort_err) + fc->aborted = true; + fuse_abort_conn(fc); fuse_conn_put(fc); } return count; |
