mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
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
This commit is contained in:
commit
e8f2b548de
5 changed files with 107 additions and 107 deletions
|
|
@ -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;}
|
||||
|
|
|
|||
Loading…
Reference in a new issue