From: Jes.Sorensen@redhat.com
To: neilb@suse.de
Cc: linux-raid@vger.kernel.org
Subject: [PATCH 09/11] super1.c: use ROUND_UP/ROUND_UP_PTR
Date: Tue, 20 Mar 2012 17:54:14 +0100 [thread overview]
Message-ID: <1332262456-5109-10-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>
---
super1.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/super1.c b/super1.c
index 350e27a..612ae98 100644
--- a/super1.c
+++ b/super1.c
@@ -174,7 +174,7 @@ static int aread(struct align_fd *afd, void *buf, int len)
"invalid block size\n");
return -1;
}
- b = (char*)(((long)(abuf+4096))&~4095UL);
+ b = ROUND_UP_PTR((char *)abuf, 4096);
for (iosize = 0; iosize < len; iosize += bsize)
;
@@ -207,7 +207,7 @@ static int awrite(struct align_fd *afd, void *buf, int len)
"invalid block size\n");
return -1;
}
- b = (char*)(((long)(abuf+4096))&~4095UL);
+ b = ROUND_UP_PTR((char *)abuf, 4096);
for (iosize = 0; iosize < len ; iosize += bsize)
;
@@ -1037,8 +1037,7 @@ static int store_super1(struct supertype *st, int fd)
if (lseek64(fd, sb_offset << 9, 0)< 0LL)
return 3;
- sbsize = sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev);
- sbsize = (sbsize+511)&(~511UL);
+ sbsize = ROUND_UP(sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev), 512);
if (awrite(&afd, sb, sbsize) != sbsize)
return 4;
--
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 ` Jes.Sorensen [this message]
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 ` [PATCH 11/11] __write_init_super_ddf(): Use posix_memalign() instead of static aligned buffer Jes.Sorensen
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-10-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).