Skip to content

btrfs: enhance btrfs device path rename

Qu Wenruo linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 8 repliesIn review
  2. v12 patches 5 repliesSuperseded

Changes in v2 from the cover letter

- Update the example of the first patch
Instead of using the special C program, just touch the soft link to trigger the rescan.

- Add Link and reported-by tags for the first patch

- Fix a "weird" -> "wild" typo
This is really weird...

- Remove the debugging pr_info()

- Use safer strscpy() to replace strncpy()

- Use the shortcut version of conditional operator when possible

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2btrfs: avoid unnecessary device path update for the same devicefs/btrfs/volumes.c+27 -13 replies
2/2btrfs: canonicalize the device path before adding itfs/btrfs/volumes.c+78 -15 replies

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchFilipe Manana
1/2R-b
2/2R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/2] btrfs: enhance btrfs device path rename

[CHANGELOG]
v2:
- Update the example of the first patch
Instead of using the special C program, just touch the soft link to trigger the rescan.

- Add Link and reported-by tags for the first patch

- Fix a "weird" -> "wild" typo
This is really weird...

- Remove the debugging pr_info()

- Use safer strscpy() to replace strncpy()

- Use the shortcut version of conditional operator when possible

Fabian Vogt reported a very interesting case where we can use "/proc/self/fd/3" to mount a btrfs, then that /proc name will remain as the device path for the btrfs.

Sometimes udev scan can trigger a rename, and get a proper name back, but if that doesn't win the race, we got the "/proc/self/fd/3" in the mtab which makes no sense, since "/proc/self" is bounded to the current process, no one is going to know where the real device is.

So to enhance the handling:

- Do proper path comparison to determine if we want to update device path
Currently the path comparison is done by strcmp(), which will never handle different hard nor soft links.

Instead go with path_equal() on the resolved paths, which is way more reliable.
This should reduce the unnecessary path name updates in the first place.

- Canonicalize the device path if it's not inside "/dev/"
If we pass a soft link which is not inside "/dev/", we just follow the soft link and use the final destination instead.

It can be something like "/dev/dm-2", other than more readable LVM names like "/dev/test/scratch1", but it's still way better than "/proc/self/fd/3".

If the soft link itself is already inside "/dev/", then we can directly use the path.

This is to allow fstest run properly without forced to use "/dev/dm-*" instead of the "/dev/mapper/test-scratch1" as test devices.
Otherwise fs tests will reject runs because it believe the btrfs is mounted somewhere else.

Qu Wenruo (2):
btrfs: avoid unnecessary device path update for the same device
btrfs: canonicalize the device path before adding it

 fs/btrfs/volumes.c | 107 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 105 insertions(+), 2 deletions(-)
Signature · 1 line
2.46.1