Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull trivial vfs updates from Al Viro: "A few cleanups + Neil's namespace_unlock() optimization" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: exec: make prepare_bprm_creds static genheaders: %-<width>s had been there since v6; %-*s - since v7 VFS: use synchronize_rcu_expedited() in namespace_unlock() iov_iter: reduce code duplication

Linus Torvalds committed 7 years ago

Commit 9b286ef2 parents 47f3f4e e4f22835 files · +38 −50Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/binfmts.h+0−1

@@ -139,7 +139,6 @@ extern int transfer_args_to_stack(struct linux_binprm *bprm, · 138 unmodified lines
139	extern int bprm_change_interp(const char interp, struct linux_binprm bprm);	139	extern int bprm_change_interp(const char interp, struct linux_binprm bprm);
140	extern int copy_strings_kernel(int argc, const char const argv,	140	extern int copy_strings_kernel(int argc, const char const argv,
141	struct linux_binprm *bprm);	141	struct linux_binprm *bprm);
142	extern int prepare_bprm_creds(struct linux_binprm *bprm);
143	extern void install_exec_creds(struct linux_binprm *bprm);	142	extern void install_exec_creds(struct linux_binprm *bprm);
144	extern void set_binfmt(struct linux_binfmt *new);	143	extern void set_binfmt(struct linux_binfmt *new);
145	extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t);	144	extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t);