diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_iops.c')
-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 94d5fd6a2973..d9298cf60266 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -103,7 +103,8 @@ xfs_mark_inode_dirty( | |||
103 | STATIC int | 103 | STATIC int |
104 | xfs_init_security( | 104 | xfs_init_security( |
105 | struct inode *inode, | 105 | struct inode *inode, |
106 | struct inode *dir) | 106 | struct inode *dir, |
107 | const struct qstr *qstr) | ||
107 | { | 108 | { |
108 | struct xfs_inode *ip = XFS_I(inode); | 109 | struct xfs_inode *ip = XFS_I(inode); |
109 | size_t length; | 110 | size_t length; |
@@ -111,7 +112,7 @@ xfs_init_security( | |||
111 | unsigned char *name; | 112 | unsigned char *name; |
112 | int error; | 113 | int error; |
113 | 114 | ||
114 | error = security_inode_init_security(inode, dir, (char **)&name, | 115 | error = security_inode_init_security(inode, dir, qstr, (char **)&name, |
115 | &value, &length); | 116 | &value, &length); |
116 | if (error) { | 117 | if (error) { |
117 | if (error == -EOPNOTSUPP) | 118 | if (error == -EOPNOTSUPP) |
@@ -195,7 +196,7 @@ xfs_vn_mknod( | |||
195 | 196 | ||
196 | inode = VFS_I(ip); | 197 | inode = VFS_I(ip); |
197 | 198 | ||
198 | error = xfs_init_security(inode, dir); | 199 | error = xfs_init_security(inode, dir, &dentry->d_name); |
199 | if (unlikely(error)) | 200 | if (unlikely(error)) |
200 | goto out_cleanup_inode; | 201 | goto out_cleanup_inode; |
201 | 202 | ||
@@ -368,7 +369,7 @@ xfs_vn_symlink( | |||
368 | 369 | ||
369 | inode = VFS_I(cip); | 370 | inode = VFS_I(cip); |
370 | 371 | ||
371 | error = xfs_init_security(inode, dir); | 372 | error = xfs_init_security(inode, dir, &dentry->d_name); |
372 | if (unlikely(error)) | 373 | if (unlikely(error)) |
373 | goto out_cleanup_inode; | 374 | goto out_cleanup_inode; |
374 | 375 | ||