Commit 28db47b2 authored by Dave Kleikamp's avatar Dave Kleikamp

JFS: Fix compiler errors in xattr.c

Fix errors due to header differences between mainline kernel and
acl.bestbits.org patches.
parent 8c5a65c6
...@@ -640,7 +640,7 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size) ...@@ -640,7 +640,7 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
} }
static int can_set_xattr(struct inode *inode, const char *name, static int can_set_xattr(struct inode *inode, const char *name,
const void *value, size_t value_len) void *value, size_t value_len)
{ {
if (IS_RDONLY(inode)) if (IS_RDONLY(inode))
return -EROFS; return -EROFS;
...@@ -650,7 +650,7 @@ static int can_set_xattr(struct inode *inode, const char *name, ...@@ -650,7 +650,7 @@ static int can_set_xattr(struct inode *inode, const char *name,
if((strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) != 0) && if((strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) != 0) &&
(strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) != 0)) (strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) != 0))
return -ENOTSUP; return -EOPNOTSUPP;
if (!S_ISREG(inode->i_mode) && if (!S_ISREG(inode->i_mode) &&
(!S_ISDIR(inode->i_mode) || inode->i_mode &S_ISVTX)) (!S_ISDIR(inode->i_mode) || inode->i_mode &S_ISVTX))
...@@ -659,7 +659,7 @@ static int can_set_xattr(struct inode *inode, const char *name, ...@@ -659,7 +659,7 @@ static int can_set_xattr(struct inode *inode, const char *name,
return permission(inode, MAY_WRITE); return permission(inode, MAY_WRITE);
} }
int __jfs_setxattr(struct inode *inode, const char *name, const void *value, int __jfs_setxattr(struct inode *inode, const char *name, void *value,
size_t value_len, int flags) size_t value_len, int flags)
{ {
struct jfs_ea_list *ealist; struct jfs_ea_list *ealist;
...@@ -798,7 +798,7 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value, ...@@ -798,7 +798,7 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
return rc; return rc;
} }
int jfs_setxattr(struct dentry *dentry, const char *name, const void *value, int jfs_setxattr(struct dentry *dentry, const char *name, void *value,
size_t value_len, int flags) size_t value_len, int flags)
{ {
if (value == NULL) { /* empty EA, do not remove */ if (value == NULL) { /* empty EA, do not remove */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment