Module Name: src
Committed By: uebayasi
Date: Thu Oct 21 17:45:21 UTC 2010
Modified Files:
src/sys/ufs/ffs [uebayasi-xip]: ffs_vfsops.c
Log Message:
Handle XIP mount error properly.
To generate a diff of this commit:
cvs rdiff -u -r1.257.2.11 -r1.257.2.12 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.11 src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.12
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.11 Thu Oct 21 08:45:04 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Thu Oct 21 17:45:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257.2.11 2010/10/21 08:45:04 uebayasi Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.257.2.12 2010/10/21 17:45:21 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.11 2010/10/21 08:45:04 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.12 2010/10/21 17:45:21 uebayasi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1186,15 +1186,20 @@
(((fs)->fs_bsize & PAGE_MASK) == 0 && \
((fs)->fs_fsize & PAGE_MASK) == 0)
- void *physseg = NULL;
+ void *seg = NULL;
- if ((mp->mnt_flag & MNT_XIP) != 0 &&
- (mp->mnt_flag & MNT_RDONLY) != 0 &&
- VOP_IOCTL(devvp, DIOCGPHYSSEG, &physseg, FREAD, cred) == 0 &&
- physseg != NULL &&
- FS_IS_PAGE_ALIGNED_P(fs)) {
- mp->mnt_flag |= MNT_XIP;
- devvp->v_physseg = physseg;
+ if ((mp->mnt_flag & MNT_XIP) != 0) {
+ if ((mp->mnt_flag & MNT_RDONLY) != 0 &&
+ VOP_IOCTL(devvp, DIOCGPHYSSEG, &seg, FREAD, cred) == 0 &&
+ seg != NULL &&
+ FS_IS_PAGE_ALIGNED_P(fs)) {
+ mp->mnt_flag |= MNT_XIP;
+ devvp->v_physseg = seg;
+ } else {
+ error = ENXIO;
+ free(fs->fs_csp, M_UFSMNT);
+ goto out;
+ }
}
#endif
#ifdef FFS_EI
