diff options
| author | mckusick <mckusick@FreeBSD.org> | 2011-07-30 00:43:18 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2011-07-30 00:43:18 +0000 |
| commit | 7a7c3b6e78c347dbbc2ca8360853a5c0000d66af (patch) | |
| tree | a6f176e9f360e6601aa3c623c7984db6df633c75 /sbin/mount | |
| parent | 9494715d4b3d5d10e2451c54bcb68a5f91c6e5f5 (diff) | |
| download | FreeBSD-src-7a7c3b6e78c347dbbc2ca8360853a5c0000d66af.zip FreeBSD-src-7a7c3b6e78c347dbbc2ca8360853a5c0000d66af.tar.gz | |
Update to -r224294 to ensure that only one of MNT_SUJ or MNT_SOFTDEP
is set so that mount can revert back to using MNT_NOWAIT when doing
getmntinfo.
Approved by: re (kib)
Diffstat (limited to 'sbin/mount')
| -rw-r--r-- | sbin/mount/mount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 61d1747..6e8f3b5 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -317,7 +317,7 @@ main(int argc, char *argv[]) rval = 0; switch (argc) { case 0: - if ((mntsize = getmntinfo(&mntbuf, MNT_WAIT)) == 0) + if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) err(1, "getmntinfo"); if (all) { while ((fs = getfsent()) != NULL) { @@ -666,7 +666,7 @@ getmntpt(const char *name) struct statfs *mntbuf; int i, mntsize; - mntsize = getmntinfo(&mntbuf, MNT_WAIT); + mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); for (i = mntsize - 1; i >= 0; i--) { if (strcmp(mntbuf[i].f_mntfromname, name) == 0 || strcmp(mntbuf[i].f_mntonname, name) == 0) |
