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 /module/zfs/zpl_xattr.c | |
| 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 'module/zfs/zpl_xattr.c')
| -rw-r--r-- | module/zfs/zpl_xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index bb9341422..f274407e5 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -404,14 +404,16 @@ __zpl_xattr_security_set(struct inode *ip, const char *name, ZPL_XATTR_SET_WRAPPER(zpl_xattr_security_set); int -zpl_xattr_security_init(struct inode *ip, struct inode *dip) +zpl_xattr_security_init(struct inode *ip, struct inode *dip, + const struct qstr *qstr) { int error; size_t len; void *value; char *name; - error = security_inode_init_security(ip, dip, &name, &value, &len); + error = zpl_security_inode_init_security(ip, dip, qstr, + &name, &value, &len); if (error) { if (error == -EOPNOTSUPP) return 0; |