Update bcachefs sources to 504729f99c bcachefs: Allow answering y or n to all fsck...

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

diff --git a/libbcachefs/fs-ioctl.c b/libbcachefs/fs-ioctl.c
index 2bb680827b44763783f663e6c2a5b223852430e4..571b4dca4d39a46a6cff4a8dafe992cf0750061f 100644 (file)
--- a/libbcachefs/fs-ioctl.c
+++ b/libbcachefs/fs-ioctl.c
@@ -451,19 +451,20 @@ static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp,
                return ret;
 
        if (path.dentry->d_sb->s_fs_info != c) {
-               path_put(&path);
-               return -EXDEV;
+               ret = -EXDEV;
+               goto err;
        }
 
        dir = path.dentry->d_parent->d_inode;
 
        ret = __bch2_unlink(dir, path.dentry, true);
-       if (!ret) {
-               fsnotify_rmdir(dir, path.dentry);
-               d_delete(path.dentry);
-       }
-       path_put(&path);
+       if (ret)
+               goto err;
 
+       fsnotify_rmdir(dir, path.dentry);
+       d_delete(path.dentry);
+err:
+       path_put(&path);
        return ret;
 }