Skip to content

btrfs-progs: mkfs: introduce an experimental --subvol option

Qu Wenruo linux-btrfs 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest9 patches 0 repliesNew
  2. v16 patches 12 repliesSuperseded

Changes in v2 from the cover letter

- Crossport fs_types from kernel
So that we can have infrastructure more in-line with kernel code. Unfortunately we still need a new fs_ftypes_to_umode() helper for progs.

- More cleanups for btrfs_add_link()

- Make btrfs_add_link() have the same ability of the kernel one This is to allow btrfs_add_link() to link a subvolume to a parent inode.
Unfortunately the parameter list is still quite different due to the lack of btrfs_inode and dentry.

- Merge btrfs_mksubvol() into btrfs_add_link()
Since btrfs_add_link() can now handle linking of a subvolume, we can remove the progs specific code.

- New common/inode.[ch] for btrfs_create_subvol() and btrfs_make_root_dir()
Those two functions are progs specific and would be utilized by code out of check/convert. Thus moving them to common/ would be better

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9btrfs-progs: cross-port fs_types from kernelMakefile check/main.c check/mode-common.c +7 more+186 -510 replies
2/9btrfs-progs: remove add_backref parameter from btrfs_add_link()check/main.c check/mode-common.c check/mode-lowmem.c +3 more+31 -330 replies
3/9btrfs-progs: remove filetype parameter of btrfs_add_link()check/main.c check/mode-common.c check/mode-lowmem.c +3 more+33 -180 replies
4/9btrfs-progs: merge btrfs_mksubvol() into btrfs_add_link()check/main.c check/mode-common.c check/mode-lowmem.c +3 more+172 -1700 replies
5/9btrfs-progs: enhance btrfs_mkdir() functionkernel-shared/inode.c+36 -170 replies
6/9btrfs-progs: enhance btrfs_create_root() functionkernel-shared/ctree.c kernel-shared/ctree.h mkfs/main.c +2 more+48 -680 replies
7/9btrfs-progs: use a unified btrfs_make_subvol() implementationMakefile check/main.c common/inode.c +5 more+127 -1570 replies
8/9btrfs-progs: mkfs: introduce experimental --subvol optionmkfs/main.c mkfs/rootdir.c mkfs/rootdir.h+183 -00 replies
9/9btrfs-progs: mkfs-tests: introduce a test case to verify --subvol optiontests/mkfs-tests/031-subvol-option/test.sh+39 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/9] btrfs-progs: mkfs: introduce an experimental --subvol option

[CHANGELOG]
v2:
- Crossport fs_types from kernel
So that we can have infrastructure more in-line with kernel code. Unfortunately we still need a new fs_ftypes_to_umode() helper for progs.

- More cleanups for btrfs_add_link()

- Make btrfs_add_link() have the same ability of the kernel one This is to allow btrfs_add_link() to link a subvolume to a parent inode.
Unfortunately the parameter list is still quite different due to the lack of btrfs_inode and dentry.

- Merge btrfs_mksubvol() into btrfs_add_link()
Since btrfs_add_link() can now handle linking of a subvolume, we can remove the progs specific code.

- New common/inode.[ch] for btrfs_create_subvol() and btrfs_make_root_dir()
Those two functions are progs specific and would be utilized by code out of check/convert. Thus moving them to common/ would be better

Issue #42 (good number by the way) is suggesting a very useful feature for rootfs image creation.

Currently we only support "mkfs.btrfs --rootdir" to fill the fs tree with target directory, but there has no btrfs specific features involved.

If we can create certain paths as subvolumes, not pure directories, it can be very useful to create the whole btrfs image just by "mkfs.btrfs"

This series is the first step torwards this idea.

Now we have a new experimental option "--subvol" for mkfs.btrfs, but with the following limits:

- No co-operation with --rootdir
This requires --rootdir to have extra handling for any existing inodes.
(Currently --rootdir assumes the fs tree is completely empty)

- No multiple --subvol options supports
This requires us to collect and sort all the paths and start creating subvolumes from the shortest path.
Furthermore this requires us to create subvolume under another subvolume.

Each limit would need a new series of patches to address, but this series would already provide a working but not-that-useful implementation of "--subvol" option, along with a basic test case for it.

Qu Wenruo (9):
btrfs-progs: cross-port fs_types from kernel
btrfs-progs: remove add_backref parameter from btrfs_add_link()
btrfs-progs: remove filetype parameter of btrfs_add_link()
btrfs-progs: merge btrfs_mksubvol() into btrfs_add_link()
btrfs-progs: enhance btrfs_mkdir() function
btrfs-progs: enhance btrfs_create_root() function
btrfs-progs: use a unified btrfs_make_subvol() implementation
btrfs-progs: mkfs: introduce experimental --subvol option
btrfs-progs: mkfs-tests: introduce a test case to verify --subvol
option

 Makefile                                   |   2 +
 check/main.c                               |  17 +-
 check/mode-common.c                        |  12 +-
 check/mode-common.h                        |  32 --
 check/mode-lowmem.c                        |  40 ++-
 common/inode.c                             |  90 ++++++
 common/inode.h                             |  16 +
 convert/main.c                             | 139 ++++++---
 include/kerncompat.h                       |   1 +
 kernel-shared/ctree.c                      | 106 +++----
 kernel-shared/ctree.h                      |  17 +-
 kernel-shared/fs_types.c                   |  62 ++++
 kernel-shared/fs_types.h                   |  87 ++++++
 kernel-shared/inode.c                      | 347 ++++++++++-----------
 mkfs/common.c                              |  39 ---
 mkfs/common.h                              |   2 -
 mkfs/main.c                                | 106 ++-----
 mkfs/rootdir.c                             | 157 ++++++++++
 mkfs/rootdir.h                             |   1 +
 tests/mkfs-tests/031-subvol-option/test.sh |  39 +++
 tune/convert-bgt.c                         |   3 +-
 tune/quota.c                               |   2 +-
 22 files changed, 829 insertions(+), 488 deletions(-)
 create mode 100644 common/inode.c
 create mode 100644 common/inode.h
 create mode 100644 kernel-shared/fs_types.c
 create mode 100644 kernel-shared/fs_types.h
 create mode 100755 tests/mkfs-tests/031-subvol-option/test.sh

--
2.42.0