tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 845a2fdc 81d84a94

+11 -12
unified split
+10 -10
fs/ocfs2/aops.c
··· 798 } 799 to = from + bytes; 800 801 if (wc->w_this_page_new) 802 ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode, 803 cluster_start, cluster_end, 1); ··· 813 mlog_errno(ret); 814 goto out; 815 } 816 - 817 - BUG_ON(from > PAGE_CACHE_SIZE); 818 - BUG_ON(to > PAGE_CACHE_SIZE); 819 - BUG_ON(from > osb->s_clustersize); 820 - BUG_ON(to > osb->s_clustersize); 821 822 src = buf->ops->map(sp->s_pipe, buf, 1); 823 dst = kmap_atomic(wc->w_this_page, KM_USER1); ··· 890 891 to = from + bytes; 892 893 if (wc->w_this_page_new) 894 ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode, 895 cluster_start, cluster_end, 1); ··· 905 mlog_errno(ret); 906 goto out; 907 } 908 - 909 - BUG_ON(from > PAGE_CACHE_SIZE); 910 - BUG_ON(to > PAGE_CACHE_SIZE); 911 - BUG_ON(from > osb->s_clustersize); 912 - BUG_ON(to > osb->s_clustersize); 913 914 dst = kmap(wc->w_this_page); 915 memcpy(dst + from, bp->b_src_buf + src_from, bytes);
··· 798 } 799 to = from + bytes; 800 801 + BUG_ON(from > PAGE_CACHE_SIZE); 802 + BUG_ON(to > PAGE_CACHE_SIZE); 803 + BUG_ON(from < cluster_start); 804 + BUG_ON(to > cluster_end); 805 + 806 if (wc->w_this_page_new) 807 ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode, 808 cluster_start, cluster_end, 1); ··· 808 mlog_errno(ret); 809 goto out; 810 } 811 812 src = buf->ops->map(sp->s_pipe, buf, 1); 813 dst = kmap_atomic(wc->w_this_page, KM_USER1); ··· 890 891 to = from + bytes; 892 893 + BUG_ON(from > PAGE_CACHE_SIZE); 894 + BUG_ON(to > PAGE_CACHE_SIZE); 895 + BUG_ON(from < cluster_start); 896 + BUG_ON(to > cluster_end); 897 + 898 if (wc->w_this_page_new) 899 ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode, 900 cluster_start, cluster_end, 1); ··· 900 mlog_errno(ret); 901 goto out; 902 } 903 904 dst = kmap(wc->w_this_page); 905 memcpy(dst + from, bp->b_src_buf + src_from, bytes);
+1 -2
fs/ocfs2/cluster/masklog.c
··· 144 }; 145 146 static struct kset mlog_kset = { 147 - .kobj = {.name = "logmask"}, 148 - .ktype = &mlog_ktype 149 }; 150 151 int mlog_sys_init(struct kset *o2cb_subsys)
··· 144 }; 145 146 static struct kset mlog_kset = { 147 + .kobj = {.name = "logmask", .ktype = &mlog_ktype}, 148 }; 149 150 int mlog_sys_init(struct kset *o2cb_subsys)