Update bcachefs sources to 6d44812757dd bcachefs: BCH_IOCTL_FSCK_ONLINE

[bcachefs-tools-debian] / libbcachefs / fs-ioctl.c

diff --git a/libbcachefs/fs-ioctl.c b/libbcachefs/fs-ioctl.c
index 5a39bcb597a33d42826a16a98da394de3fe23660..561fc1da4e3a6b4a63a250d7aeb54db411cd40ac 100644 (file)
--- a/libbcachefs/fs-ioctl.c
+++ b/libbcachefs/fs-ioctl.c
@@ -287,34 +287,26 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)
 
        bch_notice(c, "shutdown by ioctl type %u", flags);
 
-       down_write(&c->vfs_sb->s_umount);
-
        switch (flags) {
        case FSOP_GOING_FLAGS_DEFAULT:
                ret = freeze_bdev(c->vfs_sb->s_bdev);
                if (ret)
-                       goto err;
-
+                       break;
                bch2_journal_flush(&c->journal);
-               c->vfs_sb->s_flags |= SB_RDONLY;
                bch2_fs_emergency_read_only(c);
                thaw_bdev(c->vfs_sb->s_bdev);
                break;
-
        case FSOP_GOING_FLAGS_LOGFLUSH:
                bch2_journal_flush(&c->journal);
                fallthrough;
-
        case FSOP_GOING_FLAGS_NOLOGFLUSH:
-               c->vfs_sb->s_flags |= SB_RDONLY;
                bch2_fs_emergency_read_only(c);
                break;
        default:
                ret = -EINVAL;
                break;
        }
-err:
-       up_write(&c->vfs_sb->s_umount);
+
        return ret;
 }
 
@@ -341,6 +333,10 @@ static long __bch2_ioctl_subvolume_create(struct bch_fs *c, struct file *filp,
             (arg.flags & BCH_SUBVOL_SNAPSHOT_RO)))
                return -EINVAL;
 
+       if ((arg.flags & BCH_SUBVOL_SNAPSHOT_CREATE) &&
+           !arg.src_ptr)
+               return -EOPNOTSUPP;
+
        if (arg.flags & BCH_SUBVOL_SNAPSHOT_CREATE)
                create_flags |= BCH_CREATE_SNAPSHOT;