From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Tue, 20 Mar 2012 16:54:06 +0000 (+0100)
Subject: super1.c don't keep recalculating bitmap pointer
X-Git-Tag: mdadm-3.2.4~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2bfdfa0fe08326d5be894b08eedd1cf0744528a;p=thirdparty%2Fmdadm.git

super1.c don't keep recalculating bitmap pointer

We just calculated the pointer to the bitmap, so use it instead of
recalculating.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/super1.c b/super1.c
index af0abe65..5ed99456 100644
--- a/super1.c
+++ b/super1.c
@@ -1395,8 +1395,7 @@ static int load_super1(struct supertype *st, int fd, char *devname)
 	 * should get that written out.
 	 */
 	locate_bitmap1(st, fd);
-	if (aread(fd, ((char*)super)+MAX_SB_SIZE, 512)
-	    != 512)
+	if (aread(fd, bsb, 512) != 512)
 		goto no_bitmap;
 
 	uuid_from_super1(st, uuid);
@@ -1663,7 +1662,7 @@ static int write_bitmap1(struct supertype *st, int fd)
 		return -ENOMEM;
 
 	memset(buf, 0xff, 4096);
-	memcpy(buf, ((char*)sb)+MAX_SB_SIZE, sizeof(bitmap_super_t));
+	memcpy(buf, (char *)bms, sizeof(bitmap_super_t));
 
 	towrite = __le64_to_cpu(bms->sync_size) / (__le32_to_cpu(bms->chunksize)>>9);
 	towrite = (towrite+7) >> 3; /* bits to bytes */