diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 18:52:07 (GMT) |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 20:50:41 (GMT) |
| commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
| tree | 40d05011708ad1b4a05928d167eb120420581aa6 /fs/coda/pioctl.c | |
| parent | 0ff8fbc61727c926883eec381fbd3d32d1fab504 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
| download | linux-fsl-qoriq-020abf03cd659388f94cb328e1e1df0656e0d7ff.tar.xz | |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
Diffstat (limited to 'fs/coda/pioctl.c')
| -rw-r--r-- | fs/coda/pioctl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index 2fd89b5..6cbb3af 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -19,12 +19,12 @@ #include <asm/uaccess.h> #include <linux/coda.h> -#include <linux/coda_linux.h> -#include <linux/coda_fs_i.h> #include <linux/coda_psdev.h> +#include "coda_linux.h" + /* pioctl ops */ -static int coda_ioctl_permission(struct inode *inode, int mask); +static int coda_ioctl_permission(struct inode *inode, int mask, unsigned int flags); static long coda_pioctl(struct file *filp, unsigned int cmd, unsigned long user_data); @@ -41,8 +41,10 @@ const struct file_operations coda_ioctl_operations = { }; /* the coda pioctl inode ops */ -static int coda_ioctl_permission(struct inode *inode, int mask) +static int coda_ioctl_permission(struct inode *inode, int mask, unsigned int flags) { + if (flags & IPERM_FLAG_RCU) + return -ECHILD; return (mask & MAY_EXEC) ? -EACCES : 0; } |