Module Name: othersrc
Committed By: pooka
Date: Sun Dec 13 20:57:25 UTC 2009
Modified Files:
othersrc/lib/libfsu_mount: filesystems.h fsu_mount.c
Log Message:
Use macro to determine disk-based file systems. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/lib/libfsu_mount/filesystems.h
cvs rdiff -u -r1.17 -r1.18 othersrc/lib/libfsu_mount/fsu_mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/lib/libfsu_mount/filesystems.h
diff -u othersrc/lib/libfsu_mount/filesystems.h:1.1 othersrc/lib/libfsu_mount/filesystems.h:1.2
--- othersrc/lib/libfsu_mount/filesystems.h:1.1 Thu Nov 5 14:02:42 2009
+++ othersrc/lib/libfsu_mount/filesystems.h Sun Dec 13 20:57:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: filesystems.h,v 1.1 2009/11/05 14:02:42 stacktic Exp $ */
+/* $NetBSD: filesystems.h,v 1.2 2009/12/13 20:57:25 pooka Exp $ */
/*
* Copyright (c) 2009 Arnaud Ysmal. All Rights Reserved.
@@ -115,6 +115,8 @@
#endif
} _args;
+#define FSU_ISDISKFS(fsufs) ((fsufs->fs_flags & FS_NO_AUTO) == 0)
+
/* supported file systems */
fsu_fs_t fslist[] = {
/* MOUNT_ args_ struct parseargs autodetect */
Index: othersrc/lib/libfsu_mount/fsu_mount.c
diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.17 othersrc/lib/libfsu_mount/fsu_mount.c:1.18
--- othersrc/lib/libfsu_mount/fsu_mount.c:1.17 Sun Dec 13 20:53:33 2009
+++ othersrc/lib/libfsu_mount/fsu_mount.c Sun Dec 13 20:57:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_mount.c,v 1.17 2009/12/13 20:53:33 pooka Exp $ */
+/* $NetBSD: fsu_mount.c,v 1.18 2009/12/13 20:57:25 pooka Exp $ */
/*
* Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved.
@@ -425,7 +425,7 @@
&(mntdp->mntd_flags), mntdp->mntd_canon_dev, mntdp->mntd_canon_dir);
if (rv == 0) {
#ifdef HAVE_UKFS_DISKLABEL
- if (fs->fs_flags == 0) {
+ if (FSU_ISDISKFS(fs)) {
ukfs = ukfs_mount_disk(fs->fs_name,
mntdp->mntd_canon_dev, mntdp->mntd_part,
mntdp->mntd_canon_dir, mntdp->mntd_flags,
