diff options
| author | Goldwyn Rodrigues <rgoldwyn@suse.com> | 2017-11-09 14:56:29 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2017-11-09 14:56:29 -0600 |
| commit | 43ba1d61e0e5f493e529fd9db20dc8a6ee6d5899 (patch) | |
| tree | eebfe92141e68ce939de8e0c49e768fd0ba44c55 | |
| parent | 0799d5cf54dcfe9579268b644c6f5706fc341e93 (diff) | |
| download | xfsprogs-dev-for-next.tar.gz | |
xfs_io: Allow partial writesfor-next
Partial writes are performed when there is an error midway
while performing the I/O. Perform the write exactly once and
return the number of bytes written so far, until the error.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
[sandeen@sandeen.net: add O to short help]
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | io/io.h | 1 | ||||
| -rw-r--r-- | io/pwrite.c | 27 | ||||
| -rw-r--r-- | man/man8/xfs_io.8 | 5 |
3 files changed, 30 insertions, 3 deletions
@@ -25,6 +25,7 @@ #define IO_RANDOM ( 0) #define IO_FORWARD ( 1) #define IO_BACKWARD (-1) +#define IO_ONCE ( 2) /* * File descriptor options diff --git a/io/pwrite.c b/io/pwrite.c index c36a661a87..26f79579e6 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -47,6 +47,7 @@ pwrite_help(void) " -W -- call fsync(2) at the end (included in timing results)\n" " -B -- write backwards through the range from offset (backwards N bytes)\n" " -F -- write forwards through the range of bytes from offset (default)\n" +" -O -- perform pwrite call once and return (maybe partial) bytes written\n" " -R -- write at random offsets in the specified range of bytes\n" " -Z N -- zeed the random number generator (used when writing randomly)\n" " (heh, zorry, the -s/-S arguments were already in use in pwrite)\n" @@ -262,6 +263,22 @@ write_buffer( } static int +write_once( + off64_t offset, + long long count, + long long *total, + int pwritev2_flags) +{ + size_t bytes; + bytes = do_pwrite(file->fd, offset, count, count, pwritev2_flags); + if (bytes < 0) + return -1; + *total = bytes; + return 1; +} + + +static int pwrite_f( int argc, char **argv) @@ -282,7 +299,7 @@ pwrite_f( init_cvtnum(&fsblocksize, &fssectsize); bsize = fsblocksize; - while ((c = getopt(argc, argv, "b:BCdf:Fi:NqRs:S:uV:wWZ:")) != EOF) { + while ((c = getopt(argc, argv, "b:BCdf:Fi:NqRs:OS:uV:wWZ:")) != EOF) { switch (c) { case 'b': tmp = cvtnum(fsblocksize, fssectsize, optarg); @@ -304,6 +321,9 @@ pwrite_f( case 'R': direction = IO_RANDOM; break; + case 'O': + direction = IO_ONCE; + break; case 'd': dflag = 1; break; @@ -405,6 +425,9 @@ pwrite_f( case IO_BACKWARD: c = write_backward(offset, &count, &total, pwritev2_flags); break; + case IO_ONCE: + c = write_once(offset, count, &total, pwritev2_flags); + break; default: total = 0; ASSERT(0); @@ -446,7 +469,7 @@ pwrite_init(void) pwrite_cmd.argmax = -1; pwrite_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; pwrite_cmd.args = -_("[-i infile [-dwNW] [-s skip]] [-b bs] [-S seed] [-FBR [-Z N]] [-V N] off len"); +_("[-i infile [-dwNOW] [-s skip]] [-b bs] [-S seed] [-FBR [-Z N]] [-V N] off len"); pwrite_cmd.oneline = _("writes a number of bytes at a specified offset"); pwrite_cmd.help = pwrite_help; diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index c2fe6aae75..9bf1a4783c 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -222,7 +222,7 @@ See the .B pread command. .TP -.BI "pwrite [ \-i " file " ] [ \-dwNW ] [ \-s " skip " ] [ \-b " size " ] [ \-S " seed " ] [ \-FBR [ \-Z " zeed " ] ] [ \-V " vectors " ] " "offset length" +.BI "pwrite [ \-i " file " ] [ \-dwNOW ] [ \-s " skip " ] [ \-b " size " ] [ \-S " seed " ] [ \-FBR [ \-Z " zeed " ] ] [ \-V " vectors " ] " "offset length" Writes a range of bytes in a specified blocksize from the given .IR offset . The bytes written can be either a set pattern or read in from another @@ -250,6 +250,9 @@ Perform the call with .I RWF_NOWAIT. .TP +.B \-O +perform pwrite once and return the (maybe partial) bytes written. +.TP .B \-W call .BR fsync (2) |