mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
ocfs2: Delete all xattr buckets during inode removal
In inode removal, we need to iterate all the buckets, remove any externally-stored EA values and delete the xattr buckets. Signed-off-by: Tao Ma <tao.ma@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
012255961c
commit
a394425643
1 changed files with 80 additions and 4 deletions
|
@ -131,6 +131,9 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode,
|
|||
struct ocfs2_xattr_info *xi,
|
||||
struct ocfs2_xattr_search *xs);
|
||||
|
||||
static int ocfs2_delete_xattr_index_block(struct inode *inode,
|
||||
struct buffer_head *xb_bh);
|
||||
|
||||
static inline struct xattr_handler *ocfs2_xattr_handler(int name_index)
|
||||
{
|
||||
struct xattr_handler *handler = NULL;
|
||||
|
@ -1511,13 +1514,14 @@ static int ocfs2_xattr_block_remove(struct inode *inode,
|
|||
struct buffer_head *blk_bh)
|
||||
{
|
||||
struct ocfs2_xattr_block *xb;
|
||||
struct ocfs2_xattr_header *header;
|
||||
int ret = 0;
|
||||
|
||||
xb = (struct ocfs2_xattr_block *)blk_bh->b_data;
|
||||
header = &(xb->xb_attrs.xb_header);
|
||||
|
||||
ret = ocfs2_remove_value_outside(inode, blk_bh, header);
|
||||
if (!(le16_to_cpu(xb->xb_flags) & OCFS2_XATTR_INDEXED)) {
|
||||
struct ocfs2_xattr_header *header = &(xb->xb_attrs.xb_header);
|
||||
ret = ocfs2_remove_value_outside(inode, blk_bh, header);
|
||||
} else
|
||||
ret = ocfs2_delete_xattr_index_block(inode, blk_bh);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -4738,3 +4742,75 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode,
|
|||
mlog_exit(ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
|
||||
struct ocfs2_xattr_bucket *bucket,
|
||||
void *para)
|
||||
{
|
||||
int ret = 0;
|
||||
struct ocfs2_xattr_header *xh = bucket->xh;
|
||||
u16 i;
|
||||
struct ocfs2_xattr_entry *xe;
|
||||
|
||||
for (i = 0; i < le16_to_cpu(xh->xh_count); i++) {
|
||||
xe = &xh->xh_entries[i];
|
||||
if (ocfs2_xattr_is_local(xe))
|
||||
continue;
|
||||
|
||||
ret = ocfs2_xattr_bucket_value_truncate(inode,
|
||||
bucket->bhs[0],
|
||||
i, 0);
|
||||
if (ret) {
|
||||
mlog_errno(ret);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ocfs2_delete_xattr_index_block(struct inode *inode,
|
||||
struct buffer_head *xb_bh)
|
||||
{
|
||||
struct ocfs2_xattr_block *xb =
|
||||
(struct ocfs2_xattr_block *)xb_bh->b_data;
|
||||
struct ocfs2_extent_list *el = &xb->xb_attrs.xb_root.xt_list;
|
||||
int ret = 0;
|
||||
u32 name_hash = UINT_MAX, e_cpos, num_clusters;
|
||||
u64 p_blkno;
|
||||
|
||||
if (le16_to_cpu(el->l_next_free_rec) == 0)
|
||||
return 0;
|
||||
|
||||
while (name_hash > 0) {
|
||||
ret = ocfs2_xattr_get_rec(inode, name_hash, &p_blkno,
|
||||
&e_cpos, &num_clusters, el);
|
||||
if (ret) {
|
||||
mlog_errno(ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = ocfs2_iterate_xattr_buckets(inode, p_blkno, num_clusters,
|
||||
ocfs2_delete_xattr_in_bucket,
|
||||
NULL);
|
||||
if (ret) {
|
||||
mlog_errno(ret);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = ocfs2_rm_xattr_cluster(inode, xb_bh,
|
||||
p_blkno, e_cpos, num_clusters);
|
||||
if (ret) {
|
||||
mlog_errno(ret);
|
||||
break;
|
||||
}
|
||||
|
||||
if (e_cpos == 0)
|
||||
break;
|
||||
|
||||
name_hash = e_cpos - 1;
|
||||
}
|
||||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue