diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-24 06:58:56 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-14 09:05:26 -0500 |
commit | 6d125529c6cbfe570ce3bf9a0728548f087499da (patch) | |
tree | 89ba434f76d224741bd0e0b0ef02b10a4ff95136 /fs | |
parent | 4ecf09fd3a7c8858198875171b684c73338fad83 (diff) |
Fix ACC_MODE() for real
commit 5300990c0370e804e49d9a59d928c5d53fb73487 had stepped on a rather
nasty mess: definitions of ACC_MODE used to be different. Fixed the
resulting breakage, converting them to variant that takes O_... value;
all callers have that and it actually simplifies life (see tomoyo part
of changes).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1b26b1620664..d930f1856ed2 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1620,7 +1620,7 @@ struct file *do_filp_open(int dfd, const char *pathname, | |||
1620 | open_flag |= O_DSYNC; | 1620 | open_flag |= O_DSYNC; |
1621 | 1621 | ||
1622 | if (!acc_mode) | 1622 | if (!acc_mode) |
1623 | acc_mode = MAY_OPEN | ACC_MODE(flag); | 1623 | acc_mode = MAY_OPEN | ACC_MODE(open_flag); |
1624 | 1624 | ||
1625 | /* O_TRUNC implies we need access checks for write permissions */ | 1625 | /* O_TRUNC implies we need access checks for write permissions */ |
1626 | if (flag & O_TRUNC) | 1626 | if (flag & O_TRUNC) |