Commit 845a2fdc 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: Fix invalid assertion during write on 64k pages
  ocfs2: Fix masklog breakage
parents 81d84a94 eeb47d12

fs/ocfs2/aops.c

+10 −10
Original line number Diff line number Diff line
@@ -798,6 +798,11 @@ int ocfs2_map_and_write_splice_data(struct inode *inode, 
	}

	to = from + bytes;



	BUG_ON(from > PAGE_CACHE_SIZE);

	BUG_ON(to > PAGE_CACHE_SIZE);

	BUG_ON(from < cluster_start);

	BUG_ON(to > cluster_end);



	if (wc->w_this_page_new)

		ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode,

					    cluster_start, cluster_end, 1);
@@ -809,11 +814,6 @@ int ocfs2_map_and_write_splice_data(struct inode *inode, 
		goto out;

	}



	BUG_ON(from > PAGE_CACHE_SIZE);

	BUG_ON(to > PAGE_CACHE_SIZE);

	BUG_ON(from > osb->s_clustersize);

	BUG_ON(to > osb->s_clustersize);



	src = buf->ops->map(sp->s_pipe, buf, 1);

	dst = kmap_atomic(wc->w_this_page, KM_USER1);

	memcpy(dst + from, src + src_from, bytes);
@@ -890,6 +890,11 @@ int ocfs2_map_and_write_user_data(struct inode *inode, 


	to = from + bytes;



	BUG_ON(from > PAGE_CACHE_SIZE);

	BUG_ON(to > PAGE_CACHE_SIZE);

	BUG_ON(from < cluster_start);

	BUG_ON(to > cluster_end);



	if (wc->w_this_page_new)

		ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode,

					    cluster_start, cluster_end, 1);
@@ -901,11 +906,6 @@ int ocfs2_map_and_write_user_data(struct inode *inode, 
		goto out;

	}



	BUG_ON(from > PAGE_CACHE_SIZE);

	BUG_ON(to > PAGE_CACHE_SIZE);

	BUG_ON(from > osb->s_clustersize);

	BUG_ON(to > osb->s_clustersize);



	dst = kmap(wc->w_this_page);

	memcpy(dst + from, bp->b_src_buf + src_from, bytes);

	kunmap(wc->w_this_page);

fs/ocfs2/cluster/masklog.c

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ static struct kobj_type mlog_ktype = { 
};



static struct kset mlog_kset = {

	.kobj  = {.name = "logmask"},

	.ktype = &mlog_ktype

	.kobj   = {.name = "logmask", .ktype = &mlog_ktype},

};



int mlog_sys_init(struct kset *o2cb_subsys)