diff options
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 3b601f115b6c..e158ec6b527b 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -353,7 +353,7 @@ int __mnt_want_write(struct vfsmount *m) | |||
353 | * incremented count after it has set MNT_WRITE_HOLD. | 353 | * incremented count after it has set MNT_WRITE_HOLD. |
354 | */ | 354 | */ |
355 | smp_mb(); | 355 | smp_mb(); |
356 | while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) | 356 | while (READ_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) |
357 | cpu_relax(); | 357 | cpu_relax(); |
358 | /* | 358 | /* |
359 | * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will | 359 | * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will |
@@ -2825,7 +2825,8 @@ long do_mount(const char *dev_name, const char __user *dir_name, | |||
2825 | SB_MANDLOCK | | 2825 | SB_MANDLOCK | |
2826 | SB_DIRSYNC | | 2826 | SB_DIRSYNC | |
2827 | SB_SILENT | | 2827 | SB_SILENT | |
2828 | SB_POSIXACL); | 2828 | SB_POSIXACL | |
2829 | SB_I_VERSION); | ||
2829 | 2830 | ||
2830 | if (flags & MS_REMOUNT) | 2831 | if (flags & MS_REMOUNT) |
2831 | retval = do_remount(&path, flags, sb_flags, mnt_flags, | 2832 | retval = do_remount(&path, flags, sb_flags, mnt_flags, |