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

Commit 30b8548f authored by tao.ma@oracle.com's avatar tao.ma@oracle.com Committed by Mark Fasheh
Browse files

[PATCH] ocfs2: Fix a wrong cluster calculation. 



In ocfs2_alloc_write_write_ctxt, the written clusters length is calculated
by the byte length only. This may cause some problems if we start to write
at some position in the end of one cluster and last to a second cluster
while the "len" is smaller than a cluster size. In that case, we have to
write 2 clusters actually.
So we have to take the start position into consideration also.

Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent c0123ade

fs/ocfs2/aops.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -855,6 +855,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp, 
				  struct ocfs2_super *osb, loff_t pos,

				  struct ocfs2_super *osb, loff_t pos,

				  unsigned len, struct buffer_head *di_bh)

				  unsigned len, struct buffer_head *di_bh)

{

{

	u32 cend;

	struct ocfs2_write_ctxt *wc;

	struct ocfs2_write_ctxt *wc;





	wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS);

	wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS);
@@ -862,7 +863,8 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp, 
		return -ENOMEM;

		return -ENOMEM;





	wc->w_cpos = pos >> osb->s_clustersize_bits;

	wc->w_cpos = pos >> osb->s_clustersize_bits;

	wc->w_clen = ocfs2_clusters_for_bytes(osb->sb, len);

	cend = (pos + len - 1) >> osb->s_clustersize_bits;

	wc->w_clen = cend - wc->w_cpos + 1;

	get_bh(di_bh);

	get_bh(di_bh);

	wc->w_di_bh = di_bh;

	wc->w_di_bh = di_bh;