Fixes subvol delete on a non-btrfs volume #42272
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Inode numbers are guaranteed to be unique only within a filesystem. As such there is an edge case where these predicates are true on a non-btrfs filesystem. Closes moby#42271 Signed-off-by: Brett Milford <brettmilford@gmail.com>
thaJeztah
reviewed
Apr 8, 2021
There was a problem hiding this comment.
left a minor nit; but let me ask @tianon @AkihiroSuda to review
contrib/nuke-graph-directory.sh
Outdated
| set -x | ||
| btrfs subvolume delete "$subvol" | ||
| ) | ||
| if [ "$(stat -f --format=%T $subvol)" == "btrfs" ]; then |
There was a problem hiding this comment.
I realize this script specified bash, but I know we try to stay close to POSIX where possible, to allow running scripts in non-bash environments; perhaps change this to;
Suggested change
| if [ "$(stat -f --format=%T $subvol)" == "btrfs" ]; then | |
| if [ "$(stat -f --format=%T $subvol)" = "btrfs" ]; then |
There was a problem hiding this comment.
Full agreement from me 😇
I'd go one step further, too:
Suggested change
| if [ "$(stat -f --format=%T $subvol)" == "btrfs" ]; then | |
| if [ "$(stat -f --format=%T "$subvol")" = "btrfs" ]; then |
Or even (to catch any possible failing exit code from stat):
Suggested change
| if [ "$(stat -f --format=%T $subvol)" == "btrfs" ]; then | |
| if subvolType="$(stat -f --format=%T "$subvol")" && [ "$subvolType" = "btrfs" ]; then |
tianon
reviewed
Apr 8, 2021
contrib/nuke-graph-directory.sh
Outdated
| @@ -61,10 +61,12 @@ if command -v btrfs > /dev/null 2>&1; then | |||
| # Source: http://stackoverflow.com/a/32865333 | |||
| for subvol in $(find "$dir" -type d -inum 256 | sort -r); do | |||
| if [ "$dir" != "$subvol" ]; then | |||
There was a problem hiding this comment.
Oh, it's probably worth bringing that conditinoal all the way up to here, ala:
Suggested change
| if [ "$dir" != "$subvol" ]; then | |
| if [ "$dir" != "$subvol" ] && subvolType="$(stat -f --format=%T "$subvol")" && [ "$subvolType" = "btrfs" ]; then |
(So we only have a single if)
There was a problem hiding this comment.
that's, nifty; and looks good to me.
Signed-off-by: Brett Milford <brettmilford@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Inode numbers are guaranteed to be unique only within a filesystem.
As such there is an edge case where these predicates are true on a
non-btrfs filesystem.
Closes #42271
Signed-off-by: Brett Milford brettmilford@gmail.com
- What I did
Added an additional check for filesystem type.
- How to verify it
Tested this code block on btrfs and non-btrfs (zfs) filesystems.
- Description for the changelog
Fixed issue where
nuke-graph-directory.shexecutes btrfs subvolume delete on a non-btrfs file.