diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 19:50:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 19:50:54 +0200 |
| commit | b8d4c1f9f48e344fe1d6e6ffae01d4b31bf0aac0 (patch) | |
| tree | 24685a7b0ebf8af0ff55f1384e0be125aa29da47 /fs/statfs.c | |
| parent | Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | dentry name snapshots (diff) | |
| download | linux-b8d4c1f9f48e344fe1d6e6ffae01d4b31bf0aac0.tar.xz linux-b8d4c1f9f48e344fe1d6e6ffae01d4b31bf0aac0.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc filesystem updates from Al Viro:
"Assorted normal VFS / filesystems stuff..."
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
dentry name snapshots
Make statfs properly return read-only state after emergency remount
fs/dcache: init in_lookup_hashtable
minix: Deinline get_block, save 2691 bytes
fs: Reorder inode_owner_or_capable() to avoid needless
fs: warn in case userspace lied about modprobe return
Diffstat (limited to 'fs/statfs.c')
| -rw-r--r-- | fs/statfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/statfs.c b/fs/statfs.c index 41a6a82da5e2..fab9b6a3c116 100644 --- a/fs/statfs.c +++ b/fs/statfs.c @@ -38,6 +38,8 @@ static int flags_by_sb(int s_flags) flags |= ST_SYNCHRONOUS; if (s_flags & MS_MANDLOCK) flags |= ST_MANDLOCK; + if (s_flags & MS_RDONLY) + flags |= ST_RDONLY; return flags; } |