diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 13:18:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 13:18:59 -0800 |
| commit | 9b286efeb5eb5aaa2712873fc1f928b2f879dbde (patch) | |
| tree | 42c5509700421853533443a3e042fe2ac46a0f37 /fs | |
| parent | Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux (diff) | |
| parent | Merge branches 'misc.misc' and 'work.iov_iter' into for-linus (diff) | |
| download | linux-dev-9b286efeb5eb5aaa2712873fc1f928b2f879dbde.tar.xz linux-dev-9b286efeb5eb5aaa2712873fc1f928b2f879dbde.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 2 | ||||
| -rw-r--r-- | fs/namespace.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c index 44320d893f1a..fb72d36f7823 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1402,7 +1402,7 @@ EXPORT_SYMBOL(finalize_exec); * Or, if exec fails before, free_bprm() should release ->cred and * and unlock. */ -int prepare_bprm_creds(struct linux_binprm *bprm) +static int prepare_bprm_creds(struct linux_binprm *bprm) { if (mutex_lock_interruptible(¤t->signal->cred_guard_mutex)) return -ERESTARTNOINTR; diff --git a/fs/namespace.c b/fs/namespace.c index 97b7c7098c3d..9b0140e7d8da 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1360,7 +1360,7 @@ static void namespace_unlock(void) if (likely(hlist_empty(&head))) return; - synchronize_rcu(); + synchronize_rcu_expedited(); group_pin_kill(&head); } |