summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-06 00:18:59 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-06 00:18:59 +0300
commit9b286efeb5eb5aaa2712873fc1f928b2f879dbde (patch)
tree42c5509700421853533443a3e042fe2ac46a0f37 /fs
parent47f3f4eb7834ea424b0704bffd0d3e3c8ffbc3a1 (diff)
parente4f2283cc6ffefbe414317a0d89b602811b577ac (diff)
downloadlinux-9b286efeb5eb5aaa2712873fc1f928b2f879dbde.tar.xz
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.c2
-rw-r--r--fs/namespace.c2
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(&current->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);
}