diff options
| author | Mark Harmstone <mark@harmstone.com> | 2026-02-17 17:32:39 +0000 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2026-02-26 15:03:28 +0100 |
| commit | 1c7e9111f4e6d6d42bc47759c9af1ef91f03ac2c (patch) | |
| tree | e78e40389723b0ff0423e01ef5ba2a78e944d7a9 /fs | |
| parent | 44e2fda66427a0442d8d2c0e6443256fb458ab6b (diff) | |
| download | linux-next-1c7e9111f4e6d6d42bc47759c9af1ef91f03ac2c.tar.gz linux-next-1c7e9111f4e6d6d42bc47759c9af1ef91f03ac2c.zip | |
btrfs: print correct subvol num if active swapfile prevents deletion
Fix the error message in btrfs_delete_subvolume() if we can't delete a
subvolume because it has an active swapfile: we were printing the number
of the parent rather than the target.
Fixes: 60021bd754c6 ("btrfs: prevent subvol with swapfile from being deleted")
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Mark Harmstone <mark@harmstone.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ade590707793..d28d55beaacd 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4779,7 +4779,7 @@ int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry) spin_unlock(&dest->root_item_lock); btrfs_warn(fs_info, "attempt to delete subvolume %llu with active swapfile", - btrfs_root_id(root)); + btrfs_root_id(dest)); ret = -EPERM; goto out_up_write; } |