diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:51:20 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 10:51:23 +1100 |
commit | 534e28c6d7bfda8a4feb29b031b7f1ff19f381a3 (patch) | |
tree | 2598529b7c7a2f071a2a1a74ceff6f222916d3dd /arch | |
parent | e6e7d375e6eeafe519f82271c3b103396ca624d6 (diff) | |
parent | 792ac387333b2a91578f69ce696f24186609beaa (diff) |
Merge remote branch 'vfs/for-next'
Conflicts:
fs/gfs2/ops_inode.c
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 3b3c36601a7b..de317d0c3294 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -140,7 +140,7 @@ void mconsole_proc(struct mc_request *req) goto out; } - err = may_open(&nd.path, MAY_READ, FMODE_READ); + err = may_open(&nd.path, MAY_READ, O_RDONLY); if (result) { mconsole_reply(req, "Failed to open file", 1, 0); path_put(&nd.path); |