mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-20 15:43:16 +00:00
Don't include the file system ID in the output of `mount -v' if it
is all zeros. The kernel now consistently zeroes FSIDs for non-root users, so there's no point in printing these. Also fix a misspelling in a comment. Submitted by: Rudolf Cejka <cejkar@fit.vutbr.cz> Approved by: re (scottl)
This commit is contained in:
parent
335cd66dc2
commit
8b91818711
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=123160
@ -365,8 +365,9 @@ umountfs(struct statfs *sfs)
|
|||||||
warn("unmount of %s failed", sfs->f_mntonname);
|
warn("unmount of %s failed", sfs->f_mntonname);
|
||||||
if (errno != ENOENT)
|
if (errno != ENOENT)
|
||||||
return (1);
|
return (1);
|
||||||
/* Compatability for old kernels. */
|
/* Compatibility for old kernels. */
|
||||||
warnx("retrying using path instead of file system ID");
|
if (sfs->f_fsid.val[0] != 0 || sfs->f_fsid.val[1] != 0)
|
||||||
|
warnx("retrying using path instead of file system ID");
|
||||||
if (unmount(sfs->f_mntonname, fflag) != 0) {
|
if (unmount(sfs->f_mntonname, fflag) != 0) {
|
||||||
warn("unmount of %s failed", sfs->f_mntonname);
|
warn("unmount of %s failed", sfs->f_mntonname);
|
||||||
return (1);
|
return (1);
|
||||||
@ -557,7 +558,7 @@ mntinfo(struct statfs **mntbuf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert a hexidecimal filesystem ID to an fsid_t.
|
* Convert a hexadecimal filesystem ID to an fsid_t.
|
||||||
* Returns 0 on success.
|
* Returns 0 on success.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
|
Loading…
Reference in New Issue
Block a user