summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-08-07 07:51:29 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-08-07 14:40:08 -0400
commit215748e67d893169de9e62c3416e9e035e9e9c5f (patch)
tree5a9d7296ea50260ed6207e33f14d2f319105ef26 /kernel
parent17c0a5aaffa63da6b5c73a31e36616bdcd12d143 (diff)
downloadop-kernel-dev-215748e67d893169de9e62c3416e9e035e9e9c5f.zip
op-kernel-dev-215748e67d893169de9e62c3416e9e035e9e9c5f.tar.gz
acct: move mnt_pin() upwards.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/acct.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/acct.c b/kernel/acct.c
index d9ebc96..2d9e04d 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -206,7 +206,6 @@ static void acct_kill(struct bsd_acct_struct *acct,
ns->bacct = new;
if (new) {
struct vfsmount *m = new->file->f_path.mnt;
- mnt_pin(m);
spin_lock(&acct_lock);
hlist_add_head(&new->s_list, &m->mnt_sb->s_pins);
hlist_add_head(&new->m_list, &real_mount(m)->mnt_pins);
@@ -256,6 +255,7 @@ static int acct_on(struct filename *pathname)
acct->ns = ns;
mutex_init(&acct->lock);
mnt = file->f_path.mnt;
+ mnt_pin(mnt);
old = acct_get(ns);
mutex_lock_nested(&acct->lock, 1); /* nobody has seen it yet */
@@ -264,7 +264,6 @@ static int acct_on(struct filename *pathname)
} else {
ns->bacct = acct;
spin_lock(&acct_lock);
- mnt_pin(mnt);
hlist_add_head(&acct->s_list, &mnt->mnt_sb->s_pins);
hlist_add_head(&acct->m_list, &real_mount(mnt)->mnt_pins);
spin_unlock(&acct_lock);
OpenPOWER on IntegriCloud