X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fio.c;h=13af1aecc14336043ff8cc85856429152195a301;hp=999922b12e517c63be16ce1b20d7d22d077f9acc;hb=04cf551d15ee93716aa0462adadc0a3891480813;hpb=6dbbfabca414018b4c5acb3e6e597d84e2b19caf

diff --git a/ccan/tdb2/io.c b/ccan/tdb2/io.c
index 999922b1..13af1aec 100644
--- a/ccan/tdb2/io.c
+++ b/ccan/tdb2/io.c
@@ -182,7 +182,7 @@ int zero_out(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len)
 	}
 	while (len) {
 		unsigned todo = len < sizeof(buf) ? len : sizeof(buf);
-		if (tdb->methods->write(tdb, off, buf, todo) == -1)
+		if (tdb->methods->twrite(tdb, off, buf, todo) == -1)
 			return -1;
 		len -= todo;
 		off += todo;
@@ -206,25 +206,6 @@ tdb_off_t tdb_read_off(struct tdb_context *tdb, tdb_off_t off)
 	return ret;
 }
 
-/* Even on files, we can get partial writes due to signals. */
-bool tdb_pwrite_all(int fd, const void *buf, size_t len, tdb_off_t off)
-{
-	while (len) {
-		ssize_t ret;
-		ret = pwrite(fd, buf, len, off);
-		if (ret < 0)
-			return false;
-		if (ret == 0) {
-			errno = ENOSPC;
-			return false;
-		}
-		buf = (char *)buf + ret;
-		off += ret;
-		len -= ret;
-	}
-	return true;
-}
-
 /* write a lump of data at a specified offset */
 static int tdb_write(struct tdb_context *tdb, tdb_off_t off, 
 		     const void *buf, tdb_len_t len)
@@ -246,10 +227,17 @@ static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
 	if (tdb->map_ptr) {
 		memcpy(off + (char *)tdb->map_ptr, buf, len);
 	} else {
-		if (!tdb_pwrite_all(tdb->fd, buf, len, off)) {
+		ssize_t ret;
+		ret = pwrite(tdb->fd, buf, len, off);
+		if (ret < len) {
+			/* This shouldn't happen: we avoid sparse files. */
+			if (ret >= 0)
+				errno = ENOSPC;
+
 			tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
-				   "tdb_write failed at %zu len=%zu (%s)",
-				   (size_t)off, (size_t)len, strerror(errno));
+				   "tdb_write: %zi at %zu len=%zu (%s)",
+				   ret, (size_t)off, (size_t)len,
+				   strerror(errno));
 			return -1;
 		}
 	}
@@ -294,11 +282,11 @@ int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
 			return -1;
 		}
 		memcpy(conv, rec, len);
-		ret = tdb->methods->write(tdb, off,
-					  tdb_convert(tdb, conv, len), len);
+		ret = tdb->methods->twrite(tdb, off,
+					   tdb_convert(tdb, conv, len), len);
 		free(conv);
 	} else
-		ret = tdb->methods->write(tdb, off, rec, len);
+		ret = tdb->methods->twrite(tdb, off, rec, len);
 
 	return ret;
 }
@@ -306,7 +294,7 @@ int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
 int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
 		      void *rec, size_t len)
 {
-	int ret = tdb->methods->read(tdb, off, rec, len);
+	int ret = tdb->methods->tread(tdb, off, rec, len);
 	tdb_convert(tdb, rec, len);
 	return ret;
 }
@@ -341,8 +329,8 @@ static void *_tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset,
 		tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_ERROR,
 			   "tdb_alloc_read malloc failed len=%zu",
 			   (size_t)(prefix + len));
-	} else if (unlikely(tdb->methods->read(tdb, offset, buf+prefix,
-					       len) == -1)) {
+	} else if (unlikely(tdb->methods->tread(tdb, offset, buf+prefix, len)
+			    == -1)) {
 		free(buf);
 		buf = NULL;
 	}
@@ -361,10 +349,15 @@ static int fill(struct tdb_context *tdb,
 {
 	while (len) {
 		size_t n = len > size ? size : len;
+		ssize_t ret = pwrite(tdb->fd, buf, n, off);
+		if (ret < n) {
+			if (ret >= 0)
+				errno = ENOSPC;
 
-		if (!tdb_pwrite_all(tdb->fd, buf, n, off)) {
 			tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
-				 "fill write failed: giving up!");
+				   "fill failed: %zi at %zu len=%zu (%s)",
+				   ret, (size_t)off, (size_t)len,
+				   strerror(errno));
 			return -1;
 		}
 		len -= n;