diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /fs/xfs/linux-2.6/xfs_iops.c | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_iops.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 225946012d0b..e8566bbf0f00 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
| @@ -140,10 +140,10 @@ xfs_init_security( | |||
| 140 | struct xfs_inode *ip = XFS_I(inode); | 140 | struct xfs_inode *ip = XFS_I(inode); |
| 141 | size_t length; | 141 | size_t length; |
| 142 | void *value; | 142 | void *value; |
| 143 | char *name; | 143 | unsigned char *name; |
| 144 | int error; | 144 | int error; |
| 145 | 145 | ||
| 146 | error = security_inode_init_security(inode, dir, &name, | 146 | error = security_inode_init_security(inode, dir, (char **)&name, |
| 147 | &value, &length); | 147 | &value, &length); |
| 148 | if (error) { | 148 | if (error) { |
| 149 | if (error == -EOPNOTSUPP) | 149 | if (error == -EOPNOTSUPP) |