diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
commit | e8cd29b774ddd28bfe6d693c82241e294dc91e09 (patch) | |
tree | c8f904220eab7c50771558642b6c6d9240fb5368 /drivers/staging/ncpfs | |
parent | 7e739297cdbe8383bf4a5e423959107eccc01fa1 (diff) | |
parent | 73996933b53ff396d63a7fccd8e824758634dc19 (diff) | |
download | linux-stable-e8cd29b774ddd28bfe6d693c82241e294dc91e09.tar.gz linux-stable-e8cd29b774ddd28bfe6d693c82241e294dc91e09.tar.bz2 linux-stable-e8cd29b774ddd28bfe6d693c82241e294dc91e09.zip |
Merge Linus's staging merge point into staging-next
This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ncpfs')
-rw-r--r-- | drivers/staging/ncpfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ncpfs/inode.c b/drivers/staging/ncpfs/inode.c index 129f1937fa2c..41de88cdc053 100644 --- a/drivers/staging/ncpfs/inode.c +++ b/drivers/staging/ncpfs/inode.c @@ -103,7 +103,7 @@ static void destroy_inodecache(void) static int ncp_remount(struct super_block *sb, int *flags, char* data) { sync_filesystem(sb); - *flags |= MS_NODIRATIME; + *flags |= SB_NODIRATIME; return 0; } @@ -547,7 +547,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) else default_bufsize = 1024; - sb->s_flags |= MS_NODIRATIME; /* probably even noatime */ + sb->s_flags |= SB_NODIRATIME; /* probably even noatime */ sb->s_maxbytes = 0xFFFFFFFFU; sb->s_blocksize = 1024; /* Eh... Is this correct? */ sb->s_blocksize_bits = 10; |