fix fsck service location

[bcachefs-tools-debian] / cmd_device.c

diff --git a/cmd_device.c b/cmd_device.c
index aee6d7a1a6a0e41f416c1e5567fefecf32b3463c..b4bcd3452be564cb614698e8a1428d4e503e1964 100644 (file)
--- a/cmd_device.c
+++ b/cmd_device.c
@@ -132,9 +132,6 @@ int cmd_device_add(int argc, char *argv[])
                                        format_opts,
                                        &dev_opts, 1);
        free(sb);
-       fsync(dev_opts.bdev->bd_buffered_fd);
-       close(dev_opts.bdev->bd_buffered_fd);
-
        bchu_disk_add(fs, dev_opts.path);
        return 0;
 }
@@ -424,8 +421,8 @@ int cmd_device_set_state(int argc, char *argv[])
 
                le64_add_cpu(&sb.sb->seq, 1);
 
-               bch2_super_write(sb.bdev->bd_buffered_fd, sb.sb);
-               ret = fsync(sb.bdev->bd_buffered_fd);
+               bch2_super_write(sb.bdev->bd_fd, sb.sb);
+               ret = fsync(sb.bdev->bd_fd);
                if (ret)
                        fprintf(stderr, "error writing superblock: fsync error (%m)");
                bch2_free_super(&sb);
@@ -530,10 +527,9 @@ int cmd_device_resize(int argc, char *argv[])
                if (IS_ERR(c))
                        die("error opening %s: %s", dev, bch2_err_str(PTR_ERR(c)));
 
-               struct bch_dev *ca, *resize = NULL;
-               unsigned i;
+               struct bch_dev *resize = NULL;
 
-               for_each_online_member(ca, c, i) {
+               for_each_online_member(c, ca) {
                        if (resize)
                                die("confused: more than one online device?");
                        resize = ca;
@@ -628,10 +624,9 @@ int cmd_device_resize_journal(int argc, char *argv[])
                if (IS_ERR(c))
                        die("error opening %s: %s", dev, bch2_err_str(PTR_ERR(c)));
 
-               struct bch_dev *ca, *resize = NULL;
-               unsigned i;
+               struct bch_dev *resize = NULL;
 
-               for_each_online_member(ca, c, i) {
+               for_each_online_member(c, ca) {
                        if (resize)
                                die("confused: more than one online device?");
                        resize = ca;