From: Jes.Sorensen@redhat.com
To: neilb@suse.de
Cc: linux-raid@vger.kernel.org
Subject: [PATCH 11/11] __write_init_super_ddf(): Use posix_memalign() instead of static aligned buffer
Date: Tue, 20 Mar 2012 17:54:16 +0100 [thread overview]
Message-ID: <1332262456-5109-12-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1332262456-5109-1-git-send-email-Jes.Sorensen@redhat.com>
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
super-ddf.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/super-ddf.c b/super-ddf.c
index abd6793..5e51c4c 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -2326,8 +2326,7 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
* called when creating a container or adding another device to a
* container.
*/
-
-static unsigned char null_conf[4096+512];
+#define NULL_CONF_SZ 4096
static int __write_init_super_ddf(struct supertype *st)
{
@@ -2340,6 +2339,12 @@ static int __write_init_super_ddf(struct supertype *st)
int attempts = 0;
int successes = 0;
unsigned long long size, sector;
+ char *null_aligned;
+
+ if (posix_memalign((void**)&null_aligned, 4096, NULL_CONF_SZ) != 0) {
+ return -ENOMEM;
+ }
+ memset(null_aligned, 0xff, NULL_CONF_SZ);
/* try to write updated metadata,
* if we catch a failure move on to the next disk
@@ -2409,14 +2414,11 @@ static int __write_init_super_ddf(struct supertype *st)
if (write(fd, &c->conf, conf_size) < 0)
break;
} else {
- char *null_aligned = (char*)((((unsigned long)null_conf)+511)&~511UL);
- if (null_conf[0] != 0xff)
- memset(null_conf, 0xff, sizeof(null_conf));
unsigned int togo = conf_size;
- while (togo > sizeof(null_conf)-512) {
- if (write(fd, null_aligned, sizeof(null_conf)-512) < 0)
+ while (togo > NULL_CONF_SZ) {
+ if (write(fd, null_aligned, NULL_CONF_SZ) < 0)
break;
- togo -= sizeof(null_conf)-512;
+ togo -= NULL_CONF_SZ;
}
if (write(fd, null_aligned, togo) < 0)
break;
@@ -2435,6 +2437,7 @@ static int __write_init_super_ddf(struct supertype *st)
continue;
successes++;
}
+ free(null_aligned);
return attempts != successes;
}
--
1.7.7.6
next prev parent reply other threads:[~2012-03-20 16:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-20 16:54 [PATCH 00/11] Various cleanups and minor fixes Jes.Sorensen
2012-03-20 16:54 ` [PATCH 01/11] super1.c don't keep recalculating bitmap pointer Jes.Sorensen
2012-03-20 16:54 ` [PATCH 02/11] Define and use SUPER1_SIZE for allocations Jes.Sorensen
2012-03-20 16:54 ` [PATCH 03/11] init_super1() memset full buffer allocated for superblock Jes.Sorensen
2012-03-20 16:54 ` [PATCH 04/11] match_metadata_desc1(): Use calloc instead of malloc+memset Jes.Sorensen
2012-03-20 16:54 ` [PATCH 05/11] Use 4K buffer alignment for superblock allocations Jes.Sorensen
2012-03-20 16:54 ` [PATCH 06/11] Use struct align_fd to cache fd's block size for aligned reads/writes Jes.Sorensen
2012-03-20 16:54 ` [PATCH 07/11] match_metadata_desc0(): Use calloc instead of malloc+memset Jes.Sorensen
2012-03-20 16:54 ` [PATCH 08/11] Generalize ROUND_UP() macro and introduce matching ROUND_UP_PTR() Jes.Sorensen
2012-03-20 16:54 ` [PATCH 09/11] super1.c: use ROUND_UP/ROUND_UP_PTR Jes.Sorensen
2012-03-20 16:54 ` [PATCH 10/11] super-intel.c: Use ROUND_UP() instead of manually coding it Jes.Sorensen
2012-03-20 16:54 ` Jes.Sorensen [this message]
2012-03-20 21:11 ` [PATCH 00/11] Various cleanups and minor fixes NeilBrown
2012-03-21 7:58 ` Jes Sorensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332262456-5109-12-git-send-email-Jes.Sorensen@redhat.com \
--to=jes.sorensen@redhat.com \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).