diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
| commit | 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 (patch) | |
| tree | c5a3439c1c140eb87f7e3ece2e1148dece037b4f /include/linux/security.h | |
| parent | a7fed7620b6eeaba98a558df46bb50a31828b462 (diff) | |
| parent | 520b2756d9414cb6b0f6fc70714e95ee9248ebf4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index ca02f1716736..8ce59ef3e5af 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1456,7 +1456,7 @@ struct security_operations { struct inode *new_dir, struct dentry *new_dentry); int (*inode_readlink) (struct dentry *dentry); int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd); - int (*inode_permission) (struct inode *inode, int mask); + int (*inode_permission) (struct inode *inode, int mask, unsigned flags); int (*inode_setattr) (struct dentry *dentry, struct iattr *attr); int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry); int (*inode_setxattr) (struct dentry *dentry, const char *name, |