diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:24:06 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:24:06 +0800 |
commit | 0b19a18adaea49e25bbdcec4b46efc4d1f199efa (patch) | |
tree | 9730682ed99187f14d31341a06176d9c3ca97ce5 /fs/isofs/inode.c | |
parent | 7f61045ad5c0a055e08bb90f779914fe1b585981 (diff) | |
parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlinux-linaro-lsk-android-test
Conflicts:
drivers/android/binder.c
skip stable commit 517052446f36 u_ether: don't starve tx request queue
in drivers/usb/gadget/function/u_ether.c, since it isn't fit in android
Diffstat (limited to 'fs/isofs/inode.c')
-rw-r--r-- | fs/isofs/inode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index d67a16f2a45d..350f67fb5b9c 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -690,6 +690,11 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) pri_bh = NULL; root_found: + /* We don't support read-write mounts */ + if (!(s->s_flags & MS_RDONLY)) { + error = -EACCES; + goto out_freebh; + } if (joliet_level && (pri == NULL || !opt.rock)) { /* This is the case of Joliet with the norock mount flag. @@ -1503,9 +1508,6 @@ struct inode *__isofs_iget(struct super_block *sb, static struct dentry *isofs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { - /* We don't support read-write mounts */ - if (!(flags & MS_RDONLY)) - return ERR_PTR(-EACCES); return mount_bdev(fs_type, flags, dev_name, data, isofs_fill_super); } |