Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / fuse / control.c

diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index 989df5accaee0679d2fd6641753564ca7ef663c9..fe80bea4ad8969e4b0cd7ed6488e57a49b4ff61d 100644 (file)
--- 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;