diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 19:22:49 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 19:22:49 (GMT) |
commit | e8f2b548de7ae65e17ee911e54712a3f26f69c60 (patch) | |
tree | 0b332c254088effc61d832f9e95d65861251214e /include | |
parent | 43ecdb0d31cf63d99d060af0585bf59be7fafcb2 (diff) | |
parent | e9c5d8a562f01b211926d70443378eb14b29a676 (diff) | |
download | linux-fsl-qoriq-e8f2b548de7ae65e17ee911e54712a3f26f69c60.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A nasty bug in fs/namespace.c caught by Andrey + a couple of less
serious unpleasantness - ecryptfs misc device playing hopeless games
with try_module_get() and palinfo procfs support being... not quite
correctly done, to be polite."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
mnt: release locks on error path in do_loopback
palinfo fixes
procfs: add proc_remove_subtree()
ecryptfs: close rmmod race
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/proc_fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 8307f2f..94dfb2a 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -117,6 +117,7 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, const struct file_operations *proc_fops, void *data); extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent); +extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent); struct pid_namespace; @@ -202,6 +203,7 @@ static inline struct proc_dir_entry *proc_create_data(const char *name, return NULL; } #define remove_proc_entry(name, parent) do {} while (0) +#define remove_proc_subtree(name, parent) do {} while (0) static inline struct proc_dir_entry *proc_symlink(const char *name, struct proc_dir_entry *parent,const char *dest) {return NULL;} |