projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.19-rc4-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
fs
/
fuse
/
cuse.c
diff --git
a/fs/fuse/cuse.c
b/fs/fuse/cuse.c
index
966ace8
..
28d0c7a
100644
(file)
--- a/
fs/fuse/cuse.c
+++ b/
fs/fuse/cuse.c
@@
-415,7
+415,7
@@
err_unlock:
err_region:
unregister_chrdev_region(devt, 1);
err:
- fuse_
conn_kill
(fc);
+ fuse_
abort_conn
(fc);
goto out;
}