diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:32:20 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:32:20 +0900 |
| commit | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch) | |
| tree | 6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /include/linux/security.h | |
| parent | dc3e5b6a6e842116ec2436161adf31877f09b6b9 (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| download | cachepc-linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.gz cachepc-linux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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, |