X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Futils.c;h=2231522762bce81ac83aa69ecb321cadb7ffd0d4;hb=80d21c039e784e6b693a5e78069816ca6f9b7939;hp=de44e8b998b0236890acf1f7209420e1fd49c988;hpb=1d5788f77942214706d39fd0fb79196ef127a8ab;p=platform%2Fupstream%2Fcryptsetup.git

diff --git a/lib/utils.c b/lib/utils.c
index de44e8b..2231522 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -105,7 +105,7 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
 		memcpy(hangover_buf, (char*)buf + solid, hangover);
 
 		r = write(fd, hangover_buf, bsize);
-		if (r < 0 || r != bsize)
+		if (r < 0 || r < hangover)
 			goto out;
 	}
 	ret = count;
@@ -145,7 +145,7 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
 		if (!hangover_buf)
 			goto out;
 		r = read(fd, hangover_buf, bsize);
-		if (r <  0 || r != bsize)
+		if (r <  0 || r < hangover)
 			goto out;
 
 		memcpy((char *)buf + solid, hangover_buf, hangover);
@@ -238,7 +238,7 @@ int crypt_memlock_inc(struct crypt_device *ctx)
 			log_err(ctx, _("Cannot get process priority.\n"));
 		else
 			if (setpriority(PRIO_PROCESS, 0, DEFAULT_PROCESS_PRIORITY))
-				log_err(ctx, _("setpriority %d failed: %s\n"),
+				log_dbg("setpriority %d failed: %s",
 					DEFAULT_PROCESS_PRIORITY, strerror(errno));
 	}
 	return _memlock_count ? 1 : 0;
@@ -251,7 +251,7 @@ int crypt_memlock_dec(struct crypt_device *ctx)
 		if (munlockall() == -1)
 			log_err(ctx, _("Cannot unlock memory.\n"));
 		if (setpriority(PRIO_PROCESS, 0, _priority))
-			log_err(ctx, _("setpriority %d failed: %s\n"), _priority, strerror(errno));
+			log_dbg("setpriority %d failed: %s", _priority, strerror(errno));
 	}
 	return _memlock_count ? 1 : 0;
 }