git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
ext4
/
file.c
diff --git
a/fs/ext4/file.c
b/fs/ext4/file.c
index 57dcaea762c37c5aff02df20215dcb8d69bfbd97..da9c6948ad25dcd16ff2ed894b46c431b72fc91d 100644
(file)
--- a/
fs/ext4/file.c
+++ b/
fs/ext4/file.c
@@
-371,7
+371,7
@@
static int ext4_file_open(struct inode * inode, struct file * filp)
return -EIO;
if (unlikely(!(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED) &&
- !
(sb->s_flags & MS_RDONLY
))) {
+ !
sb_rdonly(sb
))) {
sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED;
/*
* Sample where the filesystem has been mounted and