Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+10
-10
fs/ocfs2/aops.c
+10
-10
fs/ocfs2/aops.c
···
798
798
}
799
799
to = from + bytes;
800
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
+
801
806
if (wc->w_this_page_new)
802
807
ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode,
803
808
cluster_start, cluster_end, 1);
···
813
808
mlog_errno(ret);
814
809
goto out;
815
810
}
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
811
822
812
src = buf->ops->map(sp->s_pipe, buf, 1);
823
813
dst = kmap_atomic(wc->w_this_page, KM_USER1);
···
890
890
891
891
to = from + bytes;
892
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
+
893
898
if (wc->w_this_page_new)
894
899
ret = ocfs2_map_page_blocks(wc->w_this_page, p_blkno, inode,
895
900
cluster_start, cluster_end, 1);
···
905
900
mlog_errno(ret);
906
901
goto out;
907
902
}
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
903
914
904
dst = kmap(wc->w_this_page);
915
905
memcpy(dst + from, bp->b_src_buf + src_from, bytes);