diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/bad_inode.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/bad_inode.c')
| -rw-r--r-- | fs/bad_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bad_inode.c b/fs/bad_inode.c index f024d8aaddef..bfcb18feb1df 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c | |||
| @@ -229,7 +229,7 @@ static int bad_inode_readlink(struct dentry *dentry, char __user *buffer, | |||
| 229 | return -EIO; | 229 | return -EIO; |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | static int bad_inode_permission(struct inode *inode, int mask) | 232 | static int bad_inode_permission(struct inode *inode, int mask, unsigned int flags) |
| 233 | { | 233 | { |
| 234 | return -EIO; | 234 | return -EIO; |
| 235 | } | 235 | } |