aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vorel <pvorel@suse.cz>2023-04-14 02:57:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-14 02:57:26 +0000
commitb6cf553062dde16c0c3b2936c3cb39c2a7dc5cf5 (patch)
tree79f05a7cd3bac62853209cd6238f580ee480a37d
parentb5f53072a28ae1ef9e8978793c7f0c901b978fcb (diff)
parent47978812022effa5452663651a733579537370f4 (diff)
downloadltp-b6cf553062dde16c0c3b2936c3cb39c2a7dc5cf5.tar.gz
tst_device: Fix formatting am: d5dfc72e08 am: ed3b4f735b am: 4797881202
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2532126 Change-Id: Ib11e3636592bc8c643802fea4c8cbb90856926a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--lib/tst_device.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/tst_device.c b/lib/tst_device.c
index cf1985754..303824614 100644
--- a/lib/tst_device.c
+++ b/lib/tst_device.c
@@ -113,7 +113,7 @@ int tst_find_free_loopdev(char *path, size_t path_len)
break;
case EACCES:
tst_resm(TINFO | TERRNO,
- "Not allowed to open " LOOP_CONTROL_FILE ". "
+ "Not allowed to open " LOOP_CONTROL_FILE ". "
"Are you root?");
break;
default:
@@ -256,7 +256,8 @@ int tst_detach_device_by_fd(const char *dev, int dev_fd)
int ret, i;
/* keep trying to clear LOOPDEV until we get ENXIO, a quick succession
- * of attach/detach might not give udev enough time to complete */
+ * of attach/detach might not give udev enough time to complete
+ */
for (i = 0; i < 40; i++) {
ret = ioctl(dev_fd, LOOP_CLR_FD, 0);
@@ -357,7 +358,7 @@ const char *tst_acquire_device_(void (cleanup_fn)(void), unsigned int size)
if (!tst_tmpdir_created()) {
tst_brkm(TBROK, cleanup_fn,
- "Cannot acquire device without tmpdir() created");
+ "Cannot acquire device without tmpdir() created");
return NULL;
}
@@ -413,17 +414,17 @@ int tst_umount(const char *path)
if (err != EBUSY) {
tst_resm(TWARN, "umount('%s') failed with %s",
- path, tst_strerrno(err));
+ path, tst_strerrno(err));
errno = err;
return ret;
}
tst_resm(TINFO, "umount('%s') failed with %s, try %2i...",
- path, tst_strerrno(err), i+1);
+ path, tst_strerrno(err), i+1);
if (i == 0) {
tst_resm(TINFO, "Likely gvfsd-trash is probing newly "
- "mounted fs, kill it to speed up tests.");
+ "mounted fs, kill it to speed up tests.");
}
usleep(100000);