Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff9cb43c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Use xs->bucket to set xattr value outside
  ocfs2: Fix a bug found by sparse check.
  ocfs2: tweak to get the maximum inline data size with xattr
  ocfs2: reserve xattr block for new directory with inline data
parents 2a4c13ba 712e53e4

fs/ocfs2/alloc.c

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static int ocfs2_dinode_insert_check(struct inode *inode, 


	BUG_ON(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL);

	mlog_bug_on_msg(!ocfs2_sparse_alloc(osb) &&

			(OCFS2_I(inode)->ip_clusters != rec->e_cpos),

			(OCFS2_I(inode)->ip_clusters !=

			 le32_to_cpu(rec->e_cpos)),

			"Device %s, asking for sparse allocation: inode %llu, "

			"cpos %u, clusters %u\n",

			osb->dev_str,

fs/ocfs2/aops.c

+5 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, 
	size = i_size_read(inode);



	if (size > PAGE_CACHE_SIZE ||

	    size > ocfs2_max_inline_data(inode->i_sb)) {

	    size > ocfs2_max_inline_data_with_xattr(inode->i_sb, di)) {

		ocfs2_error(inode->i_sb,

			    "Inode %llu has with inline data has bad size: %Lu",

			    (unsigned long long)OCFS2_I(inode)->ip_blkno,
@@ -1555,6 +1555,7 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping, 
	int ret, written = 0;

	loff_t end = pos + len;

	struct ocfs2_inode_info *oi = OCFS2_I(inode);

	struct ocfs2_dinode *di = NULL;



	mlog(0, "Inode %llu, write of %u bytes at off %llu. features: 0x%x\n",

	     (unsigned long long)oi->ip_blkno, len, (unsigned long long)pos,
@@ -1587,7 +1588,9 @@ static int ocfs2_try_to_write_inline_data(struct address_space *mapping, 
	/*

	 * Check whether the write can fit.

	 */

	if (mmap_page || end > ocfs2_max_inline_data(inode->i_sb))

	di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;

	if (mmap_page ||

	    end > ocfs2_max_inline_data_with_xattr(inode->i_sb, di))

		return 0;



do_inline_write:

fs/ocfs2/namei.c

+2 −1
Original line number Diff line number Diff line
@@ -532,7 +532,8 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, 


		fe->i_dyn_features = cpu_to_le16(feat | OCFS2_INLINE_DATA_FL);



		fe->id2.i_data.id_count = cpu_to_le16(ocfs2_max_inline_data(osb->sb));

		fe->id2.i_data.id_count = cpu_to_le16(

				ocfs2_max_inline_data_with_xattr(osb->sb, fe));

	} else {

		fel = &fe->id2.i_list;

		fel->l_tree_depth = 0;

fs/ocfs2/ocfs2_fs.h

+0 −6
Original line number Diff line number Diff line
@@ -1070,12 +1070,6 @@ static inline int ocfs2_fast_symlink_chars(struct super_block *sb) 
		 offsetof(struct ocfs2_dinode, id2.i_symlink);

}



static inline int ocfs2_max_inline_data(struct super_block *sb)

{

	return sb->s_blocksize -

		offsetof(struct ocfs2_dinode, id2.i_data.id_data);

}



static inline int ocfs2_max_inline_data_with_xattr(struct super_block *sb,

						   struct ocfs2_dinode *di)

{

fs/ocfs2/xattr.c

+24 −6
Original line number Diff line number Diff line
@@ -547,8 +547,12 @@ int ocfs2_calc_xattr_init(struct inode *dir, 
	 * when blocksize = 512, may reserve one more cluser for

	 * xattr bucket, otherwise reserve one metadata block

	 * for them is ok.

	 * If this is a new directory with inline data,

	 * we choose to reserve the entire inline area for

	 * directory contents and force an external xattr block.

	 */

	if (dir->i_sb->s_blocksize == OCFS2_MIN_BLOCKSIZE ||

	    (S_ISDIR(mode) && ocfs2_supports_inline_data(osb)) ||

	    (s_size + a_size) > OCFS2_XATTR_FREE_IN_IBODY) {

		ret = ocfs2_reserve_new_metadata_blocks(osb, 1, xattr_ac);

		if (ret) {
@@ -4791,19 +4795,33 @@ static int ocfs2_xattr_bucket_set_value_outside(struct inode *inode, 
						char *val,

						int value_len)

{

	int offset;

	int ret, offset, block_off;

	struct ocfs2_xattr_value_root *xv;

	struct ocfs2_xattr_entry *xe = xs->here;

	struct ocfs2_xattr_header *xh = bucket_xh(xs->bucket);

	void *base;



	BUG_ON(!xs->base || !xe || ocfs2_xattr_is_local(xe));



	offset = le16_to_cpu(xe->xe_name_offset) +

		 OCFS2_XATTR_SIZE(xe->xe_name_len);

	ret = ocfs2_xattr_bucket_get_name_value(inode, xh,

						xe - xh->xh_entries,

						&block_off,

						&offset);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	xv = (struct ocfs2_xattr_value_root *)(xs->base + offset);

	base = bucket_block(xs->bucket, block_off);

	xv = (struct ocfs2_xattr_value_root *)(base + offset +

		 OCFS2_XATTR_SIZE(xe->xe_name_len));



	return __ocfs2_xattr_set_value_outside(inode, handle,

	ret = __ocfs2_xattr_set_value_outside(inode, handle,

					      xv, val, value_len);

	if (ret)

		mlog_errno(ret);

out:

	return ret;

}



static int ocfs2_rm_xattr_cluster(struct inode *inode,