git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
file.c
diff --git
a/fs/ocfs2/file.c
b/fs/ocfs2/file.c
index
f6cba56
..
bdadbae
100644
(file)
--- a/
fs/ocfs2/file.c
+++ b/
fs/ocfs2/file.c
@@
-1307,10
+1307,13
@@
bail:
return err;
}
return err;
}
-int ocfs2_permission(struct inode *inode, int mask)
+int ocfs2_permission(struct inode *inode, int mask
, unsigned int flags
)
{
int ret;
{
int ret;
+ if (flags & IPERM_FLAG_RCU)
+ return -ECHILD;
+
mlog_entry_void();
ret = ocfs2_inode_lock(inode, NULL, 0);
mlog_entry_void();
ret = ocfs2_inode_lock(inode, NULL, 0);
@@
-1320,7
+1323,7
@@
int ocfs2_permission(struct inode *inode, int mask)
goto out;
}
goto out;
}
- ret = generic_permission(inode, mask, ocfs2_check_acl);
+ ret = generic_permission(inode, mask,
flags,
ocfs2_check_acl);
ocfs2_inode_unlock(inode, 0);
out:
ocfs2_inode_unlock(inode, 0);
out: