This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / jfs / xattr.c

diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 967253c..ad74981 100644 (file)
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -550,7 +550,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
        }
        ea_buf->flag = EA_EXTENT;
        ea_buf->mp = read_metapage(inode, addressDXD(&ji->ea),
-                                  lengthDXD(&ji->ea), 1);
+                                  lengthDXD(&ji->ea) << sb->s_blocksize_bits,
+                                  1);
        if (ea_buf->mp == NULL)
                return -EIO;
        ea_buf->xattr = ea_buf->mp->data;
@@ -737,11 +738,7 @@ static int can_set_xattr(struct inode *inode, const char *name,
            (!S_ISDIR(inode->i_mode) || inode->i_mode &S_ISVTX))
                return -EPERM;
 
-#ifdef CONFIG_JFS_POSIX_ACL
-       return jfs_permission(inode, MAY_WRITE, NULL);
-#else
        return permission(inode, MAY_WRITE, NULL);
-#endif
 }
 
 int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
@@ -900,13 +897,9 @@ int jfs_setxattr(struct dentry *dentry, const char *name, const void *value,
 
 static int can_get_xattr(struct inode *inode, const char *name)
 {
-#ifdef CONFIG_JFS_POSIX_ACL
        if(strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN) == 0)
                return 0;
-       return jfs_permission(inode, MAY_READ, NULL);
-#else
        return permission(inode, MAY_READ, NULL);
-#endif
 }
 
 ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,