diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
| commit | 1ed0948eea079a4c802d08cdb2e8db1eee0860f1 (patch) | |
| tree | cf7d2861d1557a305b0c7786661b9e99c343d215 /fs/pnode.c | |
| parent | 68f0f2690e183306b52671a9ad09fb31808b0500 (diff) | |
| parent | 6553896666433e7efec589838b400a2a652b3ffa (diff) | |
| download | linux-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.tar.bz2 | |
Merge tag 'noinstr-lds-2020-05-19' into core/rcu
Get the noinstr section and annotation markers to base the RCU parts on.
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 49f6d7ff2139..1106137c747a 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -261,14 +261,13 @@ static int propagate_one(struct mount *m) child = copy_tree(last_source, last_source->mnt.mnt_root, type); if (IS_ERR(child)) return PTR_ERR(child); + read_seqlock_excl(&mount_lock); mnt_set_mountpoint(m, mp, child); + if (m->mnt_master != dest_master) + SET_MNT_MARK(m->mnt_master); + read_sequnlock_excl(&mount_lock); last_dest = m; last_source = child; - if (m->mnt_master != dest_master) { - read_seqlock_excl(&mount_lock); - SET_MNT_MARK(m->mnt_master); - read_sequnlock_excl(&mount_lock); - } hlist_add_head(&child->mnt_hash, list); return count_mounts(m->mnt_ns, child); } |