[src/uebayasi-xip]: src/sys/ufs/ffs Handle XIP mount error properly.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5bb238942219
branches:  uebayasi-xip
changeset: 751808:5bb238942219
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Oct 21 17:45:21 2010 +0000

description:
Handle XIP mount error properly.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diffs (47 lines):

diff -r a9a20ca0279f -r 5bb238942219 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Thu Oct 21 17:16:28 2010 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Thu Oct 21 17:45:21 2010 +0000
@@ -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