diff options
| author | Brian Behlendorf <[email protected]> | 2011-05-19 12:47:32 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-07-01 12:40:08 -0700 |
| commit | 5c03efc379693f992ebe39c6a00c7297c4a304ea (patch) | |
| tree | 276b91b77f0fcd1c09774dcdc8b8d831b54be729 /include/linux | |
| parent | bd2f5ac97f4265523fb1397d845eabb8647c79e4 (diff) | |
Linux compat 2.6.39: security_inode_init_security()
The security_inode_init_security() function now takes an additional
qstr argument which must be passed in from the dentry if available.
Passing a NULL is safe when no qstr is available the relevant
security checks will just be skipped.
Closes #246
Closes #217
Closes #187
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/Makefile.in | 1 | ||||
| -rw-r--r-- | include/linux/xattr_compat.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in index e6c5ebf7a..269613190 100644 --- a/include/linux/Makefile.in +++ b/include/linux/Makefile.in @@ -66,6 +66,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \ $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \ $(top_srcdir)/config/kernel-rq-is_sync.m4 \ + $(top_srcdir)/config/kernel-security-inode-init.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 \ diff --git a/include/linux/xattr_compat.h b/include/linux/xattr_compat.h index 9878aab72..84d8fdeb8 100644 --- a/include/linux/xattr_compat.h +++ b/include/linux/xattr_compat.h @@ -84,4 +84,12 @@ fn(struct inode *ip, const char *name, const void *buffer, \ } #endif /* HAVE_DENTRY_XATTR_SET */ +#ifdef HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY +#define zpl_security_inode_init_security(ip, dip, qstr, nm, val, len) \ + security_inode_init_security(ip, dip, qstr, nm, val, len) +#else +#define zpl_security_inode_init_security(ip, dip, qstr, nm, val, len) \ + security_inode_init_security(ip, dip, nm, val, len) +#endif /* HAVE_6ARGS_SECURITY_INODE_INIT_SECURITY */ + #endif /* _ZFS_XATTR_H */ |