summaryrefslogtreecommitdiffstats
path: root/fs/coda/dir.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-28 15:07:54 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-28 15:07:54 +0200
commita403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch)
tree6526d8d3c46f2443c7836bf094366179a57e7aad /fs/coda/dir.c
parenta05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff)
parentd974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff)
downloadtalos-obmc-linux-a403e45c3b678211ee3b7225dbb924921fb5ddd3.tar.gz
talos-obmc-linux-a403e45c3b678211ee3b7225dbb924921fb5ddd3.zip
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'fs/coda/dir.c')
-rw-r--r--fs/coda/dir.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 3d2580e00a3e..c5916228243c 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -137,9 +137,11 @@ exit:
}
-int coda_permission(struct inode *inode, int mask, struct nameidata *nd)
+int coda_permission(struct inode *inode, int mask)
{
int error = 0;
+
+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
if (!mask)
return 0;
OpenPOWER on IntegriCloud