diff options
| author | James Morris <jmorris@namei.org> | 2011-03-08 11:38:10 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-08 11:38:10 +1100 |
| commit | fe3fa43039d47ee4e22caf460b79b62a14937f79 (patch) | |
| tree | 9eab8d00f1227b9fe0959f32a62d892ed35803ba /fs/ext4/xattr.h | |
| parent | ee009e4a0d4555ed522a631bae9896399674f064 (diff) | |
| parent | 026eb167ae77244458fa4b4b9fc171209c079ba7 (diff) | |
| download | op-kernel-dev-fe3fa43039d47ee4e22caf460b79b62a14937f79.zip op-kernel-dev-fe3fa43039d47ee4e22caf460b79b62a14937f79.tar.gz | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Diffstat (limited to 'fs/ext4/xattr.h')
| -rw-r--r-- | fs/ext4/xattr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index 1ef1652..25b7387 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -145,10 +145,10 @@ ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, #ifdef CONFIG_EXT4_FS_SECURITY extern int ext4_init_security(handle_t *handle, struct inode *inode, - struct inode *dir); + struct inode *dir, const struct qstr *qstr); #else static inline int ext4_init_security(handle_t *handle, struct inode *inode, - struct inode *dir) + struct inode *dir, const struct qstr *qstr) { return 0; } |
