Merge branch 'build_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (eae82541) · Commits · e / devices / android_kernel_teracube_mt6765

fs/ocfs2/xattr.c

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2349,7 +2349,7 @@ static int ocfs2_xattr_bucket_find(struct inode *inode,
	*/		*/
	ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1,		ret = ocfs2_read_blocks(inode, xs->bucket.bhs[0]->b_blocknr + 1,
	blk_per_bucket - 1, &xs->bucket.bhs[1],		blk_per_bucket - 1, &xs->bucket.bhs[1],
	OCFS2_BH_CACHED);		0);
	if (ret) {		if (ret) {
	mlog_errno(ret);		mlog_errno(ret);
	goto out;		goto out;
	@@ -2426,7 +2426,7 @@ static int ocfs2_iterate_xattr_buckets(struct inode *inode,

	for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {		for (i = 0; i < num_buckets; i++, blkno += blk_per_bucket) {
	ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,		ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket,
	bucket.bhs, OCFS2_BH_CACHED);		bucket.bhs, 0);
	if (ret) {		if (ret) {
	mlog_errno(ret);		mlog_errno(ret);
	goto out;		goto out;
	@@ -2694,7 +2694,7 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode,
	ret = ocfs2_read_blocks(inode,		ret = ocfs2_read_blocks(inode,
	xs->bucket.bhs[0]->b_blocknr + 1,		xs->bucket.bhs[0]->b_blocknr + 1,
	blk_per_bucket - 1, &xs->bucket.bhs[1],		blk_per_bucket - 1, &xs->bucket.bhs[1],
	OCFS2_BH_CACHED);		0);
	if (ret) {		if (ret) {
	mlog_errno(ret);		mlog_errno(ret);
	return ret;		return ret;
	@@ -2898,8 +2898,7 @@ static int ocfs2_defrag_xattr_bucket(struct inode *inode,
	if (!bhs)		if (!bhs)
	return -ENOMEM;		return -ENOMEM;

	ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs,		ret = ocfs2_read_blocks(inode, blkno, blk_per_bucket, bhs, 0);
	OCFS2_BH_CACHED);
	if (ret)		if (ret)
	goto out;		goto out;

	@@ -3153,8 +3152,7 @@ static int ocfs2_read_xattr_bucket(struct inode *inode,

	if (!new)		if (!new)
	return ocfs2_read_blocks(inode, blkno,		return ocfs2_read_blocks(inode, blkno,
	blk_per_bucket, bhs,		blk_per_bucket, bhs, 0);
	OCFS2_BH_CACHED);

	for (i = 0; i < blk_per_bucket; i++) {		for (i = 0; i < blk_per_bucket; i++) {
	bhs[i] = sb_getblk(inode->i_sb, blkno + i);		bhs[i] = sb_getblk(inode->i_sb, blkno + i);
	@@ -4101,7 +4099,7 @@ static int ocfs2_xattr_set_entry_in_bucket(struct inode *inode,
	ret = ocfs2_read_blocks(inode,		ret = ocfs2_read_blocks(inode,
	xs->bucket.bhs[0]->b_blocknr + 1,		xs->bucket.bhs[0]->b_blocknr + 1,
	blk_per_bucket - 1, &xs->bucket.bhs[1],		blk_per_bucket - 1, &xs->bucket.bhs[1],
	OCFS2_BH_CACHED);		0);
	if (ret) {		if (ret) {
	mlog_errno(ret);		mlog_errno(ret);
	goto out;		goto out;