GFS2: Fix case where reservation finished at end of rgrp

One corner case which the original patch failed to take into
account was when there is a reservation which ended such that
the following block was one beyond the end of the rgrp in
question. This extra test fixes that case.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Reported-by: Bob Peterson <rpeterso@redhat.com>
Tested-by: Bob Peterson <rpeterso@redhat.com>

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 7ce22d8c489b99db1bd29ff81b9d7d3817982d96..c17029a92b8f5b86aa2645eaad4802947e16f1e4 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1596,6 +1596,12 @@ find_next:
                        n += (rbm->bi - initial_bi);
                        goto find_next;
                }
+               if (ret == -E2BIG) {
+                       index = 0;
+                       rbm->offset = 0;
+                       n += (rbm->bi - initial_bi);
+                       goto res_covered_end_of_rgrp;
+               }
                return ret;
 
 bitmap_full:   /* Mark bitmap as full and fall through */
@@ -1608,6 +1614,7 @@ next_bitmap:      /* Find next bitmap in the rgrp */
                index++;
                if (index == rbm->rgd->rd_length)
                        index = 0;
+res_covered_end_of_rgrp:
                rbm->bi = &rbm->rgd->rd_bits[index];
                if ((index == 0) && nowrap)
                        break;