ocfs2: Don't repeat ocfs2_xattr_block_find()
ocfs2_xattr_block_get() looks up the xattr in a startlingly familiar way; it's identical to the function ocfs2_xattr_block_find(). Let's just use the later in the former. Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
eb6ff2397d
commit
54f443f4e7
@ -111,6 +111,10 @@ static int ocfs2_xattr_bucket_get_name_value(struct inode *inode,
|
|||||||
int *block_off,
|
int *block_off,
|
||||||
int *new_offset);
|
int *new_offset);
|
||||||
|
|
||||||
|
static int ocfs2_xattr_block_find(struct inode *inode,
|
||||||
|
int name_index,
|
||||||
|
const char *name,
|
||||||
|
struct ocfs2_xattr_search *xs);
|
||||||
static int ocfs2_xattr_index_block_find(struct inode *inode,
|
static int ocfs2_xattr_index_block_find(struct inode *inode,
|
||||||
struct buffer_head *root_bh,
|
struct buffer_head *root_bh,
|
||||||
int name_index,
|
int name_index,
|
||||||
@ -760,46 +764,20 @@ static int ocfs2_xattr_block_get(struct inode *inode,
|
|||||||
size_t buffer_size,
|
size_t buffer_size,
|
||||||
struct ocfs2_xattr_search *xs)
|
struct ocfs2_xattr_search *xs)
|
||||||
{
|
{
|
||||||
struct ocfs2_dinode *di = (struct ocfs2_dinode *)xs->inode_bh->b_data;
|
|
||||||
struct buffer_head *blk_bh = NULL;
|
|
||||||
struct ocfs2_xattr_block *xb;
|
struct ocfs2_xattr_block *xb;
|
||||||
struct ocfs2_xattr_value_root *xv;
|
struct ocfs2_xattr_value_root *xv;
|
||||||
size_t size;
|
size_t size;
|
||||||
int ret = -ENODATA, name_offset, name_len, block_off, i;
|
int ret = -ENODATA, name_offset, name_len, block_off, i;
|
||||||
|
|
||||||
if (!di->i_xattr_loc)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
memset(&xs->bucket, 0, sizeof(xs->bucket));
|
memset(&xs->bucket, 0, sizeof(xs->bucket));
|
||||||
|
|
||||||
ret = ocfs2_read_block(inode, le64_to_cpu(di->i_xattr_loc), &blk_bh);
|
ret = ocfs2_xattr_block_find(inode, name_index, name, xs);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
mlog_errno(ret);
|
mlog_errno(ret);
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
xb = (struct ocfs2_xattr_block *)blk_bh->b_data;
|
|
||||||
if (!OCFS2_IS_VALID_XATTR_BLOCK(xb)) {
|
|
||||||
ret = -EIO;
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
xs->xattr_bh = blk_bh;
|
xb = (struct ocfs2_xattr_block *)xs->xattr_bh->b_data;
|
||||||
|
|
||||||
if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)) {
|
|
||||||
xs->header = &xb->xb_attrs.xb_header;
|
|
||||||
xs->base = (void *)xs->header;
|
|
||||||
xs->end = (void *)(blk_bh->b_data) + blk_bh->b_size;
|
|
||||||
xs->here = xs->header->xh_entries;
|
|
||||||
|
|
||||||
ret = ocfs2_xattr_find_entry(name_index, name, xs);
|
|
||||||
} else
|
|
||||||
ret = ocfs2_xattr_index_block_find(inode, blk_bh,
|
|
||||||
name_index,
|
|
||||||
name, xs);
|
|
||||||
|
|
||||||
if (ret)
|
|
||||||
goto cleanup;
|
|
||||||
size = le64_to_cpu(xs->here->xe_value_size);
|
size = le64_to_cpu(xs->here->xe_value_size);
|
||||||
if (buffer) {
|
if (buffer) {
|
||||||
ret = -ERANGE;
|
ret = -ERANGE;
|
||||||
@ -838,7 +816,8 @@ static int ocfs2_xattr_block_get(struct inode *inode,
|
|||||||
brelse(xs->bucket.bhs[i]);
|
brelse(xs->bucket.bhs[i]);
|
||||||
memset(&xs->bucket, 0, sizeof(xs->bucket));
|
memset(&xs->bucket, 0, sizeof(xs->bucket));
|
||||||
|
|
||||||
brelse(blk_bh);
|
brelse(xs->xattr_bh);
|
||||||
|
xs->xattr_bh = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user