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

Commit a78f9f46 authored by Tao Ma's avatar Tao Ma Committed by Joel Becker
Browse files

ocfs2: make xattr extension work with new local alloc reservation. 



The old ocfs2_xattr_extent_allocation is too optimistic about
the clusters we can get. So actually if the file system is
too fragmented, ocfs2_add_clusters_in_btree will return us
with EGAIN and we need to allocate clusters once again.

So this patch change it to a while loop so that we can allocate
clusters until we reach clusters_to_add.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Cc: stable@kernel.org
parent 0a463b74

fs/ocfs2/xattr.c

+45 −29
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, 
					 struct ocfs2_xattr_value_buf *vb,

					 struct ocfs2_xattr_set_ctxt *ctxt)

{

	int status = 0;

	int status = 0, credits;

	handle_t *handle = ctxt->handle;

	enum ocfs2_alloc_restarted why;

	u32 prev_clusters, logical_start = le32_to_cpu(vb->vb_xv->xr_clusters);
@@ -719,11 +719,12 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, 


	ocfs2_init_xattr_value_extent_tree(&et, INODE_CACHE(inode), vb);



	while (clusters_to_add) {

		status = vb->vb_access(handle, INODE_CACHE(inode), vb->vb_bh,

				       OCFS2_JOURNAL_ACCESS_WRITE);

		if (status < 0) {

			mlog_errno(status);

		goto leave;

			break;

		}



		prev_clusters = le32_to_cpu(vb->vb_xv->xr_clusters);
@@ -735,22 +736,37 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode, 
						     ctxt->data_ac,

						     ctxt->meta_ac,

						     &why);

	if (status < 0) {

		if ((status < 0) && (status != -EAGAIN)) {

			if (status != -ENOSPC)

				mlog_errno(status);

		goto leave;

			break;

		}



		ocfs2_journal_dirty(handle, vb->vb_bh);



	clusters_to_add -= le32_to_cpu(vb->vb_xv->xr_clusters) - prev_clusters;

		clusters_to_add -= le32_to_cpu(vb->vb_xv->xr_clusters) -

					 prev_clusters;



		if (why != RESTART_NONE && clusters_to_add) {

			/*

	 * We should have already allocated enough space before the transaction,

	 * so no need to restart.

			 * We can only fail in case the alloc file doesn't give

			 * up enough clusters.

			 */

	BUG_ON(why != RESTART_NONE || clusters_to_add);

			BUG_ON(why == RESTART_META);



leave:

			mlog(0, "restarting xattr value extension for %u"

			     " clusters,.\n", clusters_to_add);

			credits = ocfs2_calc_extend_credits(inode->i_sb,

							    &vb->vb_xv->xr_list,

							    clusters_to_add);

			status = ocfs2_extend_trans(handle, credits);

			if (status < 0) {

				status = -ENOMEM;

				mlog_errno(status);

				break;

			}

		}

	}



	return status;

}