From 09bd34dddad113bff5c9e3c8219e30ad5b2de230 Mon Sep 17 00:00:00 2001 From: Mark Tinguely Date: Thu, 27 Sep 2012 12:47:36 +0000 Subject: [PATCH] xfsprogs: remove duplicate vector memalign from xfs_io The vector feature of xfs_io uses its own memory buffer in the iov structure and does not use the buffer entry. Remove the duplicate memalign. v2: removed global buffer in __dump_buffer() and use passed buf pointer per Ben's detection. Signed-off-by: Mark Tinguely Reviewed-by: Ben Myers Reviewed-by: Dave Chinner --- io/pread.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/io/pread.c b/io/pread.c index f6e4ca20a..0b9454bad 100644 --- a/io/pread.c +++ b/io/pread.c @@ -76,8 +76,7 @@ alloc_iovec( buffersize = 0; for (i = 0; i < vectors; i++) { iov[i].iov_base = memalign(pagesize, bsize); - buffer = memalign(pagesize, bsize); - if (!buffer) { + if (!iov[i].iov_base) { perror("memalign"); goto unwind; } @@ -130,7 +129,7 @@ __dump_buffer( int i, j; char *p; - for (i = 0, p = (char *)buffer; i < len; i += 16) { + for (i = 0, p = (char *)buf; i < len; i += 16) { char *s = p; printf("%08llx: ", (unsigned long long)offset + i); -- 2.47.2