From patchwork Sat Aug 6 10:45:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Janda X-Patchwork-Id: 9278525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DDA5860231 for ; Sat, 13 Aug 2016 17:26:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CED8628971 for ; Sat, 13 Aug 2016 17:26:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C34E228A83; Sat, 13 Aug 2016 17:26:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0890828971 for ; Sat, 13 Aug 2016 17:26:01 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id 1D8007CA4; Sat, 13 Aug 2016 12:25:46 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 071E57CBB for ; Sat, 13 Aug 2016 12:25:44 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id B0CA2304048 for ; Sat, 13 Aug 2016 10:25:43 -0700 (PDT) X-ASG-Debug-ID: 1471109140-0bf8151be4101060001-NocioJ Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by cuda.sgi.com with ESMTP id UvitGqEJf9PKEGYg (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sat, 13 Aug 2016 10:25:41 -0700 (PDT) X-Barracuda-Envelope-From: felix.janda@posteo.de X-Barracuda-Effective-Source-IP: mout02.posteo.de[185.67.36.66] X-Barracuda-Apparent-Source-IP: 185.67.36.66 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E1FD52097C for ; Sat, 13 Aug 2016 19:25:39 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3sBTDM1yJPz104L for ; Sat, 13 Aug 2016 19:25:39 +0200 (CEST) Resent-From: Felix Janda Resent-Date: Sat, 13 Aug 2016 19:24:42 +0200 Resent-Message-ID: <20160813172442.GE3858@nyan> Resent-To: xfs@oss.sgi.com Message-Id: <721b38cd2dd2f0cfa7fd7976a1d941be3429478e.1471107858.git.felix.janda@posteo.de> In-Reply-To: References: From: Felix Janda Date: Sat, 6 Aug 2016 12:45:52 +0200 Subject: [PATCHv2 xfsprogs 07/14] replace pread64/pwrite64 by equivalent pread/pwrite To: xfs@oss.sgi.com X-ASG-Orig-Subj: [PATCHv2 xfsprogs 07/14] replace pread64/pwrite64 by equivalent pread/pwrite X-Barracuda-Connect: mout02.posteo.de[185.67.36.66] X-Barracuda-Start-Time: 1471109140 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.157.11:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 7761 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.31987 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Janda Reviewed-by: Christoph Hellwig --- copy/xfs_copy.c | 2 +- include/darwin.h | 2 -- include/freebsd.h | 2 -- io/pread.c | 10 +++++----- io/pwrite.c | 10 +++++----- libxfs/rdwr.c | 8 ++++---- mdrestore/xfs_mdrestore.c | 4 ++-- mkfs/xfs_mkfs.c | 2 +- po/de.po | 4 ++-- po/pl.po | 8 ++++---- repair/prefetch.c | 2 +- 11 files changed, 25 insertions(+), 29 deletions(-) diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index cc5207d..816ab29 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -860,7 +860,7 @@ main(int argc, char **argv) off = mp->m_sb.sb_dblocks * source_blocksize; off -= sizeof(lb); - if (pwrite64(target[i].fd, lb, sizeof(lb), off) < 0) { + if (pwrite(target[i].fd, lb, sizeof(lb), off) < 0) { do_log(_("%s: failed to write last block\n"), progname); do_log(_("\tIs target \"%s\" too small?\n"), diff --git a/include/darwin.h b/include/darwin.h index 850d733..fb13915 100644 --- a/include/darwin.h +++ b/include/darwin.h @@ -141,8 +141,6 @@ typedef u_int64_t xfs_ino_t; typedef u_int32_t xfs_dev_t; typedef int64_t xfs_daddr_t; -#define pread64 pread -#define pwrite64 pwrite #define fdatasync fsync #define memalign(a,sz) valloc(sz) diff --git a/include/freebsd.h b/include/freebsd.h index 784e287..df924ef 100644 --- a/include/freebsd.h +++ b/include/freebsd.h @@ -34,8 +34,6 @@ #define __LITTLE_ENDIAN LITTLE_ENDIAN /* FreeBSD file API is 64-bit aware */ -#define pwrite64 pwrite -#define pread64 pread #define fdatasync fsync #define memalign(a,sz) valloc(sz) diff --git a/io/pread.c b/io/pread.c index cafead0..3395503 100644 --- a/io/pread.c +++ b/io/pread.c @@ -214,7 +214,7 @@ do_pread( ssize_t buffer_size) { if (!vectors) - return pread64(fd, buffer, min(count, buffer_size), offset); + return pread(fd, buffer, min(count, buffer_size), offset); return do_preadv(fd, offset, count, buffer_size); } @@ -254,7 +254,7 @@ read_random( if (bytes == 0) break; if (bytes < 0) { - perror("pread64"); + perror("pread"); return -1; } ops++; @@ -296,7 +296,7 @@ read_backward( if (bytes == 0) return ops; if (bytes < 0) { - perror("pread64"); + perror("pread"); return -1; } ops++; @@ -314,7 +314,7 @@ read_backward( if (bytes == 0) break; if (bytes < 0) { - perror("pread64"); + perror("pread"); return -1; } ops++; @@ -345,7 +345,7 @@ read_forward( if (bytes == 0) break; if (bytes < 0) { - perror("pread64"); + perror("pread"); return -1; } ops++; diff --git a/io/pwrite.c b/io/pwrite.c index 67631ce..7c0bb7f 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -101,7 +101,7 @@ do_pwrite( ssize_t buffer_size) { if (!vectors) - return pwrite64(fd, buffer, min(count, buffer_size), offset); + return pwrite(fd, buffer, min(count, buffer_size), offset); return do_pwritev(fd, offset, count, buffer_size); } @@ -137,7 +137,7 @@ write_random( if (bytes == 0) break; if (bytes < 0) { - perror("pwrite64"); + perror("pwrite"); return -1; } ops++; @@ -175,7 +175,7 @@ write_backward( if (bytes == 0) return ops; if (bytes < 0) { - perror("pwrite64"); + perror("pwrite"); return -1; } ops++; @@ -193,7 +193,7 @@ write_backward( if (bytes == 0) break; if (bytes < 0) { - perror("pwrite64"); + perror("pwrite"); return -1; } ops++; @@ -228,7 +228,7 @@ write_buffer( if (bytes == 0) break; if (bytes < 0) { - perror("pwrite64"); + perror("pwrite"); return -1; } ops++; diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index cb74b3c..8e9d86a 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -915,7 +915,7 @@ __read_buf(int fd, void *buf, int len, off64_t offset, int flags) { int sts; - sts = pread64(fd, buf, len, offset); + sts = pread(fd, buf, len, offset); if (sts < 0) { int error = errno; fprintf(stderr, _("%s: read failed: %s\n"), @@ -1083,16 +1083,16 @@ __write_buf(int fd, void *buf, int len, off64_t offset, int flags) { int sts; - sts = pwrite64(fd, buf, len, offset); + sts = pwrite(fd, buf, len, offset); if (sts < 0) { int error = errno; - fprintf(stderr, _("%s: pwrite64 failed: %s\n"), + fprintf(stderr, _("%s: pwrite failed: %s\n"), progname, strerror(error)); if (flags & LIBXFS_B_EXIT) exit(1); return -error; } else if (sts != len) { - fprintf(stderr, _("%s: error - pwrite64 only %d of %d bytes\n"), + fprintf(stderr, _("%s: error - pwrite only %d of %d bytes\n"), progname, sts, len); if (flags & LIBXFS_B_EXIT) exit(1); diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index 1540dcd..0d399f1 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -134,7 +134,7 @@ perform_restore( off64_t off; off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb); - if (pwrite64(dst_fd, lb, sizeof(lb), off) < 0) + if (pwrite(dst_fd, lb, sizeof(lb), off) < 0) fatal("failed to write last block, is target too " "small? (error: %s)\n", strerror(errno)); } @@ -146,7 +146,7 @@ perform_restore( print_progress("%lld MB read", bytes_read >> 20); for (cur_index = 0; cur_index < mb_count; cur_index++) { - if (pwrite64(dst_fd, &block_buffer[cur_index << + if (pwrite(dst_fd, &block_buffer[cur_index << tmb.mb_blocklog], block_size, be64_to_cpu(block_index[cur_index]) << BBSHIFT) < 0) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 5d5fcb7..e038d48 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1111,7 +1111,7 @@ zero_old_xfs_structures( off = 0; for (i = 1; i < sb.sb_agcount; i++) { off += sb.sb_agblocks; - if (pwrite64(xi->dfd, buf, new_sb->sb_sectsize, + if (pwrite(xi->dfd, buf, new_sb->sb_sectsize, off << sb.sb_blocklog) == -1) break; } diff --git a/po/de.po b/po/de.po index ff1930e..fab2667 100644 --- a/po/de.po +++ b/po/de.po @@ -5893,8 +5893,8 @@ msgstr "%s: lesen fehlgeschlagen: %s\n" #: .././libxfs/rdwr.c:502 #, c-format -msgid "%s: pwrite64 failed: %s\n" -msgstr "%s: pwrite64 fehlgeschlagen: %s\n" +msgid "%s: pwrite failed: %s\n" +msgstr "%s: pwrite fehlgeschlagen: %s\n" #: .././libxfs/rdwr.c:509 #, c-format diff --git a/po/pl.po b/po/pl.po index 33a9d81..49209f3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5940,13 +5940,13 @@ msgstr "%s: błąd - odczytano tylko %d z %d bajtów\n" #: .././libxfs/rdwr.c:878 #, c-format -msgid "%s: pwrite64 failed: %s\n" -msgstr "%s: pwrite64 nie powiodło się: %s\n" +msgid "%s: pwrite failed: %s\n" +msgstr "%s: pwrite nie powiodło się: %s\n" #: .././libxfs/rdwr.c:884 #, c-format -msgid "%s: error - pwrite64 only %d of %d bytes\n" -msgstr "%s: błąd - wykonano pwrite64 tylko %d z %d bajtów\n" +msgid "%s: error - pwrite only %d of %d bytes\n" +msgstr "%s: błąd - wykonano pwrite tylko %d z %d bajtów\n" #: .././libxfs/rdwr.c:920 #, c-format diff --git a/repair/prefetch.c b/repair/prefetch.c index b4f20d9..175594c 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -565,7 +565,7 @@ pf_batch_read( /* * now read the data and put into the xfs_but_t's */ - len = pread64(mp_fd, buf, (int)(last_off - first_off), first_off); + len = pread(mp_fd, buf, (int)(last_off - first_off), first_off); /* * Check the last buffer on the list to see if we need to