| commit | 7d44b0440147d83a65270205b22e7d365de28948 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 07:43:54 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 07:43:54 2011 -0800 |
| tree | 0adc818f569f45912a19482773dabbf71b191b9d | |
| parent | 0dc1488527a3c01383a50e5df7187219567586a3 [diff] | |
| parent | 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71 [diff] |
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: fix ioctl ABI fuse: allow batching of FORGET requests fuse: separate queue for FORGET requests fuse: ioctl cleanup Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done the RCU-freeing of the inode in fuse_destroy_inode().