diff options
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index bd5727852fd..9ff7fc603d2 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
| @@ -102,7 +102,8 @@ xfs_mark_inode_dirty( | |||
| 102 | STATIC int | 102 | STATIC int |
| 103 | xfs_init_security( | 103 | xfs_init_security( |
| 104 | struct inode *inode, | 104 | struct inode *inode, |
| 105 | struct inode *dir) | 105 | struct inode *dir, |
| 106 | const struct qstr *qstr) | ||
| 106 | { | 107 | { |
| 107 | struct xfs_inode *ip = XFS_I(inode); | 108 | struct xfs_inode *ip = XFS_I(inode); |
| 108 | size_t length; | 109 | size_t length; |
| @@ -110,7 +111,7 @@ xfs_init_security( | |||
| 110 | unsigned char *name; | 111 | unsigned char *name; |
| 111 | int error; | 112 | int error; |
| 112 | 113 | ||
| 113 | error = security_inode_init_security(inode, dir, (char **)&name, | 114 | error = security_inode_init_security(inode, dir, qstr, (char **)&name, |
| 114 | &value, &length); | 115 | &value, &length); |
| 115 | if (error) { | 116 | if (error) { |
| 116 | if (error == -EOPNOTSUPP) | 117 | if (error == -EOPNOTSUPP) |
| @@ -194,7 +195,7 @@ xfs_vn_mknod( | |||
| 194 | 195 | ||
| 195 | inode = VFS_I(ip); | 196 | inode = VFS_I(ip); |
| 196 | 197 | ||
| 197 | error = xfs_init_security(inode, dir); | 198 | error = xfs_init_security(inode, dir, &dentry->d_name); |
| 198 | if (unlikely(error)) | 199 | if (unlikely(error)) |
| 199 | goto out_cleanup_inode; | 200 | goto out_cleanup_inode; |
| 200 | 201 | ||
| @@ -367,7 +368,7 @@ xfs_vn_symlink( | |||
| 367 | 368 | ||
| 368 | inode = VFS_I(cip); | 369 | inode = VFS_I(cip); |
| 369 | 370 | ||
| 370 | error = xfs_init_security(inode, dir); | 371 | error = xfs_init_security(inode, dir, &dentry->d_name); |
| 371 | if (unlikely(error)) | 372 | if (unlikely(error)) |
| 372 | goto out_cleanup_inode; | 373 | goto out_cleanup_inode; |
| 373 | 374 | ||
