2 files changed, 6 insertions, 2 deletions

diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c
index 894f3e192e6b..49cf230554a2 100644
--- a/fs/exofs/ore.c
+++ b/fs/exofs/ore.c
@@ -266,7 +266,7 @@ int  ore_get_rw_state(struct ore_layout *layout, struct ore_components *oc,
 
                         /* first/last seg is split */
                         num_raid_units += layout->group_width;
-                        sgs_per_dev = div_u64(num_raid_units, data_devs);
+                        sgs_per_dev = div_u64(num_raid_units, data_devs) + 2;
                 } else {
                         /* For Writes add parity pages array. */
                         max_par_pages = num_raid_units * pages_in_unit *
diff --git a/fs/exofs/ore_raid.c b/fs/exofs/ore_raid.c
index 29c47e5c4a86..414a2dfd9500 100644
--- a/fs/exofs/ore_raid.c
+++ b/fs/exofs/ore_raid.c
@@ -551,7 +551,11 @@ int _ore_add_parity_unit(struct ore_io_state *ios,
                             unsigned cur_len)
 {
         if (ios->reading) {
-                BUG_ON(per_dev->cur_sg >= ios->sgs_per_dev);
+                if (per_dev->cur_sg >= ios->sgs_per_dev) {
+                        ORE_DBGMSG("cur_sg(%d) >= sgs_per_dev(%d)\n" ,
+                                per_dev->cur_sg, ios->sgs_per_dev);
+                        return -ENOMEM;
+                }
                 _ore_add_sg_seg(per_dev, cur_len, true);
         } else {
                 struct __stripe_pages_2d *sp2d = ios->sp2d;