]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/librbd/fsx: use prterrcode() consistently in check_clone()
authorIlya Dryomov <idryomov@gmail.com>
Sat, 11 May 2024 07:50:47 +0000 (09:50 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 20 May 2024 13:13:45 +0000 (15:13 +0200)
While at it, don't assign ret unnecessarily.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c50a96ce98e7d2a2283bc2686bce3d42fdb4447c)

Conflicts:
src/test/librbd/fsx.cc [ commit 849757a4626f ("test/lirbd/fsx:
  fix Windows issues") not in reef ]

src/test/librbd/fsx.cc

index 94c454bf3c16e4ba6429dfc8cdb256bbda8e35f4..79ca9c1b13d73909d0d71d34f03633440bb7eed9 100644 (file)
@@ -2634,14 +2634,14 @@ check_clone(int clonenum, bool replay_image)
 
        clone_filename(filename, sizeof(filename), clonenum + 1);
        if ((fd = open(filename, O_RDONLY)) < 0) {
-               simple_err("check_clone: open", -errno);
+               prterrcode("check_clone: open", -errno);
                exit(168);
        }
 
        prt("checking clone #%d, image %s against file %s\n",
            clonenum, imagename, filename);
-       if ((ret = fstat(fd, &file_info)) < 0) {
-               simple_err("check_clone: fstat", -errno);
+       if (fstat(fd, &file_info) < 0) {
+               prterrcode("check_clone: fstat", -errno);
                exit(169);
        }
 
@@ -2663,8 +2663,8 @@ check_clone(int clonenum, bool replay_image)
                exit(97);
        }
 
-       if ((ret = pread(fd, good_buf, file_info.st_size, 0)) < 0) {
-               simple_err("check_clone: pread", -errno);
+       if (pread(fd, good_buf, file_info.st_size, 0) < 0) {
+               prterrcode("check_clone: pread", -errno);
                exit(170);
        }
        if ((ret = ops->read(&cur_ctx, 0, file_info.st_size, temp_buf)) < 0) {