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

Commit 73e83dc3 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: Pack vote message and response structures
  ocfs2: Don't double set write parameters
  ocfs2: Fix pos/len passed to ocfs2_write_cluster
  ocfs2: Allow smaller allocations during large writes
parents 176df245 813d974c

fs/ocfs2/aops.c

+19 −14
Original line number Diff line number Diff line
@@ -930,18 +930,11 @@ static void ocfs2_write_failure(struct inode *inode, 
				loff_t user_pos, unsigned user_len)

{

	int i;

	unsigned from, to;

	unsigned from = user_pos & (PAGE_CACHE_SIZE - 1),

		to = user_pos + user_len;

	struct page *tmppage;



	ocfs2_zero_new_buffers(wc->w_target_page, user_pos, user_len);



	if (wc->w_large_pages) {

		from = wc->w_target_from;

		to = wc->w_target_to;

	} else {

		from = 0;

		to = PAGE_CACHE_SIZE;

	}

	ocfs2_zero_new_buffers(wc->w_target_page, from, to);



	for(i = 0; i < wc->w_num_pages; i++) {

		tmppage = wc->w_pages[i];
@@ -991,9 +984,6 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno, 
			map_from = cluster_start;

			map_to = cluster_end;

		}



		wc->w_target_from = map_from;

		wc->w_target_to = map_to;

	} else {

		/*

		 * If we haven't allocated the new page yet, we
@@ -1211,18 +1201,33 @@ static int ocfs2_write_cluster_by_desc(struct address_space *mapping, 
				       loff_t pos, unsigned len)

{

	int ret, i;

	loff_t cluster_off;

	unsigned int local_len = len;

	struct ocfs2_write_cluster_desc *desc;

	struct ocfs2_super *osb = OCFS2_SB(mapping->host->i_sb);



	for (i = 0; i < wc->w_clen; i++) {

		desc = &wc->w_desc[i];



		/*

		 * We have to make sure that the total write passed in

		 * doesn't extend past a single cluster.

		 */

		local_len = len;

		cluster_off = pos & (osb->s_clustersize - 1);

		if ((cluster_off + local_len) > osb->s_clustersize)

			local_len = osb->s_clustersize - cluster_off;



		ret = ocfs2_write_cluster(mapping, desc->c_phys,

					  desc->c_unwritten, data_ac, meta_ac,

					  wc, desc->c_cpos, pos, len);

					  wc, desc->c_cpos, pos, local_len);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		len -= local_len;

		pos += local_len;

	}



	ret = 0;

fs/ocfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -491,8 +491,8 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, 
		goto leave;

	}



	status = ocfs2_claim_clusters(osb, handle, data_ac, 1,

				      &bit_off, &num_bits);

	status = __ocfs2_claim_clusters(osb, handle, data_ac, 1,

					clusters_to_add, &bit_off, &num_bits);

	if (status < 0) {

		if (status != -ENOSPC)

			mlog_errno(status);

fs/ocfs2/localalloc.c

+1 −3
Original line number Diff line number Diff line
@@ -524,13 +524,12 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, 
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,

				 handle_t *handle,

				 struct ocfs2_alloc_context *ac,

				 u32 min_bits,

				 u32 bits_wanted,

				 u32 *bit_off,

				 u32 *num_bits)

{

	int status, start;

	struct inode *local_alloc_inode;

	u32 bits_wanted;

	void *bitmap;

	struct ocfs2_dinode *alloc;

	struct ocfs2_local_alloc *la;
@@ -538,7 +537,6 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, 
	mlog_entry_void();

	BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL);



	bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;

	local_alloc_inode = ac->ac_inode;

	alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;

	la = OCFS2_LOCAL_ALLOC(alloc);

fs/ocfs2/localalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, 
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,

				 handle_t *handle,

				 struct ocfs2_alloc_context *ac,

				 u32 min_bits,

				 u32 bits_wanted,

				 u32 *bit_off,

				 u32 *num_bits);

fs/ocfs2/suballoc.c

+21 −8
Original line number Diff line number Diff line
@@ -1486,21 +1486,21 @@ static inline void ocfs2_block_to_cluster_group(struct inode *inode, 
 * contig. allocation, set to '1' to indicate we can deal with extents

 * of any size.

 */

int ocfs2_claim_clusters(struct ocfs2_super *osb,

int __ocfs2_claim_clusters(struct ocfs2_super *osb,

			   handle_t *handle,

			   struct ocfs2_alloc_context *ac,

			   u32 min_clusters,

			   u32 max_clusters,

			   u32 *cluster_start,

			   u32 *num_clusters)

{

	int status;

	unsigned int bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;

	unsigned int bits_wanted = max_clusters;

	u64 bg_blkno = 0;

	u16 bg_bit_off;



	mlog_entry_void();



	BUG_ON(!ac);

	BUG_ON(ac->ac_bits_given >= ac->ac_bits_wanted);



	BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL
@@ -1557,6 +1557,19 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb, 
	return status;

}



int ocfs2_claim_clusters(struct ocfs2_super *osb,

			 handle_t *handle,

			 struct ocfs2_alloc_context *ac,

			 u32 min_clusters,

			 u32 *cluster_start,

			 u32 *num_clusters)

{

	unsigned int bits_wanted = ac->ac_bits_wanted - ac->ac_bits_given;



	return __ocfs2_claim_clusters(osb, handle, ac, min_clusters,

				      bits_wanted, cluster_start, num_clusters);

}



static inline int ocfs2_block_group_clear_bits(handle_t *handle,

					       struct inode *alloc_inode,

					       struct ocfs2_group_desc *bg,