summaryrefslogtreecommitdiffstats
path: root/fs/openpromfs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 18:59:19 +0000
committerMark Brown <broonie@kernel.org>2018-01-12 18:59:19 +0000
commit9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch)
treed446bb455780d9058efe1760745bfb63207090de /fs/openpromfs
parent987da3fe175933c28aab2293505c3597052ff0e2 (diff)
parentdd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff)
downloadlinux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.bz2
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'fs/openpromfs')
-rw-r--r--fs/openpromfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index 13215f26e321..2200662a9bf1 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -369,7 +369,7 @@ static struct inode *openprom_iget(struct super_block *sb, ino_t ino)
static int openprom_remount(struct super_block *sb, int *flags, char *data)
{
sync_filesystem(sb);
- *flags |= MS_NOATIME;
+ *flags |= SB_NOATIME;
return 0;
}
@@ -386,7 +386,7 @@ static int openprom_fill_super(struct super_block *s, void *data, int silent)
struct op_inode_info *oi;
int ret;
- s->s_flags |= MS_NOATIME;
+ s->s_flags |= SB_NOATIME;
s->s_blocksize = 1024;
s->s_blocksize_bits = 10;
s->s_magic = OPENPROM_SUPER_MAGIC;