umount: Add -d option to detach md devices #972
Conversation
ricardobranco777
force-pushed
the
umount_d
branch
from
867a9e3
to
fbfcb91
Compare
| typedef enum { FIND, REMOVE, CHECKUNIQUE } dowhat; | ||
|
|
||
| static struct addrinfo *nfshost_ai = NULL; | ||
| static int fflag, vflag; | ||
| static int dflag, fflag, vflag; |
There was a problem hiding this comment.
this comment is not for you, just in general:
all of these flags should be converted to bool at some point
sbin/umount/umount.c
Outdated
| mdio.md_options = fflag ? MD_FORCE : 0; | ||
|
|
||
| if (strncmp(device, DEV_MD, sizeof(DEV_MD) - 1)) { | ||
| if (!multiple) |
There was a problem hiding this comment.
We checked this before entering the function
There was a problem hiding this comment.
We checked this before entering the function
I don't see a proper check for DEV_MD.
There was a problem hiding this comment.
sorry, i meant for multiple
There was a problem hiding this comment.
sorry, i meant for multiple
In this case we need the check to avoid a warning when using -a.
ricardobranco777
force-pushed
the
umount_d
branch
2 times, most recently
from
d871456
to
eaa3b5c
Compare
ricardobranco777
force-pushed
the
umount_d
branch
from
eaa3b5c
to
2e79aa6
Compare
| (void)printf("%s: detached\n", | ||
| sfs->f_mntfromname); | ||
| } else if (!all) | ||
| return (-1); |
There was a problem hiding this comment.
so this means umount will return a failure code if -d is specified on non /dev/md backed devices. Is this what you want? And should the error checking be done before you unmount or after when you notice you can't detach?
There was a problem hiding this comment.
so this means umount will return a failure code if -d is specified on non /dev/md backed devices. Is this what you want?
Yes, but only if the -a wasn't specified for obvious reasons.
| @@ -70,24 +80,28 @@ int checkname (char *, char **); | |||
| int umountfs(struct statfs *sfs); | |||
| void usage (void); | |||
| int xdr_dir (XDR *, char *); | |||
| int md_detach(const char *); | |||
There was a problem hiding this comment.
Since this is only used in umount.c, it should be static... but all the other functions above it should be too, so consistency wins out over standard practice. Just fyi for next time.
|
OK. I think this is ready. The style script spotted a non-static function used only in umount... but it is consistent with the others, so I'm going to let the consistency rule trump the static rule. |
Reviewed by: imp Pull Request: #972
The '-d' option tells umount(8) to detach the underlying vn(4) device if the filesystem was mounted from it. Note that vn(4) is a virtual disk and can provides multiple filesystems, so the vn(4) detaching can only succeed when all the filesystems are umounted. For example: $ vnconfig -c vn dfly.img vn4 $ mount_msdos /dev/vn4s1 /mnt/dfly/boot $ mount_ufs /dev/vn4s2a /mnt/dfly/root $ umount -d /mnt/dfly/boot umount: VNIOCDETACH: /dev/vn4: Device busy umount: detach of /dev/vn4s1 failed $ umount -d /mnt/dfly/root (now vn4 is detached) A similar option exists in Linux's and FreeBSD's umount(8). GitHub PR: #24 See Also: freebsd/freebsd-src#972
Add a
-doption to umount(8) to detach a memory device. A similar option exists in Linux's umount(8).Follow-up to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=114468