]> www.infradead.org Git - users/hch/xfsprogs.git/commitdiff
libxfs: remove LIBXFS_B_EXIT
authorDarrick J. Wong <darrick.wong@oracle.com>
Sun, 1 Mar 2020 17:33:38 +0000 (12:33 -0500)
committerEric Sandeen <sandeen@sandeen.net>
Sun, 1 Mar 2020 17:33:38 +0000 (12:33 -0500)
Now that we've removed all users of LIBXFS_B_EXIT, remove it as well.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/libxfs_io.h
libxfs/rdwr.c

index 87c6ea3e8f0a172667b5445532b347a6de68bcce..716db5537dfabcb6d1dceb0596546cd73ac794ee 100644 (file)
@@ -91,7 +91,6 @@ bool xfs_verify_magic(struct xfs_buf *bp, __be32 dmagic);
 bool xfs_verify_magic16(struct xfs_buf *bp, __be16 dmagic);
 
 /* b_flags bits */
-#define LIBXFS_B_EXIT          0x0001  /* exit if write fails */
 #define LIBXFS_B_DIRTY         0x0002  /* buffer has been modified */
 #define LIBXFS_B_STALE         0x0004  /* buffer marked as invalid */
 #define LIBXFS_B_UPTODATE      0x0008  /* buffer is sync'd to disk */
index f775e67da5a15706ab803b536d5a9374f87501d2..ba16ad4de3277af098d2c75bb1c2638a56d7359c 100644 (file)
@@ -1082,14 +1082,10 @@ __write_buf(int fd, void *buf, int len, off64_t offset, int flags)
                int error = errno;
                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 - pwrite only %d of %d bytes\n"),
                        progname, sts, len);
-               if (flags & LIBXFS_B_EXIT)
-                       exit(1);
                return -EIO;
        }
        return 0;
@@ -1160,8 +1156,7 @@ libxfs_writebufr(xfs_buf_t *bp)
                        (long long)bp->b_bn, bp->b_bcount, -bp->b_error);
        } else {
                bp->b_flags |= LIBXFS_B_UPTODATE;
-               bp->b_flags &= ~(LIBXFS_B_DIRTY | LIBXFS_B_EXIT |
-                                LIBXFS_B_UNCHECKED);
+               bp->b_flags &= ~(LIBXFS_B_DIRTY | LIBXFS_B_UNCHECKED);
        }
        return bp->b_error;
 }