diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 17:42:43 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 17:42:43 (GMT) |
commit | f741a79e982cf56d7584435bad663553ffe6715f (patch) | |
tree | 491f0a8a05d9add4c0338ee8af4a18f3508503cd /fs/fuse/fuse_i.h | |
parent | 73d5a8675f32b8e22e11773b314324316f920192 (diff) | |
parent | e7c0a167860620bd2938366896964f729ddaeaaa (diff) | |
download | linux-fsl-qoriq-f741a79e982cf56d7584435bad663553ffe6715f.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: make fuse_dentry_revalidate() RCU aware
fuse: make fuse_permission() RCU aware
fuse: wakeup pollers on connection release/abort
fuse: reduce size of struct fuse_request
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r-- | fs/fuse/fuse_i.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index d428694..b788bec 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -272,7 +272,6 @@ struct fuse_req { struct fuse_init_in init_in; struct fuse_init_out init_out; struct cuse_init_in cuse_init_in; - struct cuse_init_out cuse_init_out; struct { struct fuse_read_in in; u64 attr_ver; |