diff options
| author | James Morris <jmorris@namei.org> | 2011-03-16 09:41:17 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-16 09:41:17 +1100 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/ext2/xattr.h | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
| download | linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.bz2 | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext2/xattr.h')
| -rw-r--r-- | fs/ext2/xattr.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h index a1a1c2184616..5e41cccff762 100644 --- a/fs/ext2/xattr.h +++ b/fs/ext2/xattr.h @@ -116,9 +116,11 @@ exit_ext2_xattr(void) # endif /* CONFIG_EXT2_FS_XATTR */ #ifdef CONFIG_EXT2_FS_SECURITY -extern int ext2_init_security(struct inode *inode, struct inode *dir); +extern int ext2_init_security(struct inode *inode, struct inode *dir, + const struct qstr *qstr); #else -static inline int ext2_init_security(struct inode *inode, struct inode *dir) +static inline int ext2_init_security(struct inode *inode, struct inode *dir, + const struct qstr *qstr) { return 0; } |