[PATCH 0/3] md: trivial changes

[PATCH 0/3] md: trivial changes

[Guoqing Jiang]

Hi,

I found some trivial issues when look into md code, and
all the changes are based on for-next branch of new md
tree.

Thanks,
Guoqing

Guoqing Jiang (3):
  md/raid1: remove unnecessary BUG_ON
  md/bitmap: remove redundant return in bitmap_checkpage
  md: fix typos for stipe

 drivers/md/bitmap.c | 1 -
 drivers/md/bitmap.h | 4 ++--
 drivers/md/raid1.c  | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.6.2

[PATCH 1/3] md/raid1: remove unnecessary BUG_ON

[Guoqing Jiang]

Since bitmap_start_sync will not return until
sync_blocks is not less than PAGE_SIZE>>9, so
the BUG_ON is not needed anymore.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
 drivers/md/raid1.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4e3843f..d1d5363 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2695,7 +2695,6 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
 			    !conf->fullsync &&
 			    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
 				break;
-			BUG_ON(sync_blocks < (PAGE_SIZE>>9));
 			if ((len >> 9) > sync_blocks)
 				len = sync_blocks<<9;
 		}
-- 
2.6.2

[PATCH 2/3] md/bitmap: remove redundant return in bitmap_checkpage

[Guoqing Jiang]

The "return 0" is not needed since bitmap_checkpage
will finally return 0 for the case.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
 drivers/md/bitmap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index bbe7b64..7df6b4f 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -98,7 +98,6 @@ __acquires(bitmap->lock)
 		   bitmap->bp[page].hijacked) {
 		/* somebody beat us to getting the page */
 		kfree(mappage);
-		return 0;
 	} else {
 
 		/* no page was in place and we have one, so install it */
-- 
2.6.2

[PATCH 3/3] md: fix typos for stipe

[Guoqing Jiang]

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
 drivers/md/bitmap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 7d5c3a6..5e3fcd6 100644
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -49,8 +49,8 @@
  * When we set a bit, or in the counter (to start a write), if the fields is
  * 0, we first set the disk bit and set the counter to 1.
  *
- * If the counter is 0, the on-disk bit is clear and the stipe is clean
- * Anything that dirties the stipe pushes the counter to 2 (at least)
+ * If the counter is 0, the on-disk bit is clear and the stripe is clean
+ * Anything that dirties the stripe pushes the counter to 2 (at least)
  * and sets the on-disk bit (lazily).
  * If a periodic sweep find the counter at 2, it is decremented to 1.
  * If the sweep find the counter at 1, the on-disk bit is cleared and the
-- 
2.6.2

Re: [PATCH 0/3] md: trivial changes

[Shaohua Li]

On Mon, Mar 14, 2016 at 05:01:36PM +0800, Guoqing Jiang wrote:
> Hi,
> 
> I found some trivial issues when look into md code, and
> all the changes are based on for-next branch of new md
> tree.

Applied all three, thanks!

Thanks,
Shaohua