[Midnightbsd-cvs] src [10019] trunk/sys/fs/udf: sync udf with freebsd 10 stable

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 27 18:07:50 EDT 2018


Revision: 10019
          http://svnweb.midnightbsd.org/src/?rev=10019
Author:   laffer1
Date:     2018-05-27 18:07:49 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync udf with freebsd 10 stable

Modified Paths:
--------------
    trunk/sys/fs/udf/ecma167-udf.h
    trunk/sys/fs/udf/osta.c
    trunk/sys/fs/udf/osta.h
    trunk/sys/fs/udf/udf.h
    trunk/sys/fs/udf/udf_iconv.c
    trunk/sys/fs/udf/udf_mount.h
    trunk/sys/fs/udf/udf_vfsops.c
    trunk/sys/fs/udf/udf_vnops.c

Modified: trunk/sys/fs/udf/ecma167-udf.h
===================================================================
--- trunk/sys/fs/udf/ecma167-udf.h	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/ecma167-udf.h	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001, 2002 Scott Long <scottl at freebsd.org>
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/ecma167-udf.h 188406 2009-02-09 20:42:51Z jhb $
  */
 
 /* ecma167-udf.h */

Modified: trunk/sys/fs/udf/osta.c
===================================================================
--- trunk/sys/fs/udf/osta.c	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/osta.c	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,9 +1,10 @@
+/* $MidnightBSD$ */
 /*
  * Various routines from the OSTA 2.01 specs.  Copyrights are included with
  * each code segment.  Slight whitespace modifications have been made for
  * formatting purposes.  Typos/bugs have been fixed.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/osta.c 193571 2009-06-06 07:13:57Z rwatson $
  */
 
 #include <fs/udf/osta.h>

Modified: trunk/sys/fs/udf/osta.h
===================================================================
--- trunk/sys/fs/udf/osta.h	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/osta.h	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
 /*
  * Prototypes for the OSTA functions
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/osta.h 162255 2006-09-12 19:02:34Z imp $
  */
 
 /*-

Modified: trunk/sys/fs/udf/udf.h
===================================================================
--- trunk/sys/fs/udf/udf.h	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/udf.h	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001, 2002 Scott Long <scottl at freebsd.org>
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/udf.h 189082 2009-02-26 18:58:41Z avg $
  */
 
 #define UDF_HASHTBLSIZE 100

Modified: trunk/sys/fs/udf/udf_iconv.c
===================================================================
--- trunk/sys/fs/udf/udf_iconv.c	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/udf_iconv.c	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003 Ryuichiro Imura
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/fs/udf/udf_iconv.c 122102 2003-11-05 06:56:08Z scottl $");
 
 #include <sys/param.h>
 #include <sys/iconv.h>

Modified: trunk/sys/fs/udf/udf_mount.h
===================================================================
--- trunk/sys/fs/udf/udf_mount.h	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/udf_mount.h	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003 Ryuichiro Imura
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/udf_mount.h 122102 2003-11-05 06:56:08Z scottl $
  */
 
 #define	UDFMNT_KICONV	0x00000001

Modified: trunk/sys/fs/udf/udf_vfsops.c
===================================================================
--- trunk/sys/fs/udf/udf_vfsops.c	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/udf_vfsops.c	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001, 2002 Scott Long <scottl at freebsd.org>
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/udf_vfsops.c 242833 2012-11-09 18:02:25Z attilio $
  */
 
 /* udf_vfsops.c */
@@ -190,7 +191,7 @@
 {
 	struct vnode *devvp;	/* vnode of the mount device */
 	struct thread *td;
-	struct udf_mnt *imp = 0;
+	struct udf_mnt *imp = NULL;
 	struct vfsoptlist *opts;
 	char *fspec, *cs_disk, *cs_local;
 	int error, len, *udf_flags;
@@ -355,8 +356,7 @@
 	mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
 	MNT_ILOCK(mp);
 	mp->mnt_flag |= MNT_LOCAL;
-	mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED |
-	    MNTK_EXTENDED_SHARED;
+	mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED;
 	MNT_IUNLOCK(mp);
 	udfmp->im_mountp = mp;
 	udfmp->im_dev = dev;

Modified: trunk/sys/fs/udf/udf_vnops.c
===================================================================
--- trunk/sys/fs/udf/udf_vnops.c	2018-05-27 22:04:46 UTC (rev 10018)
+++ trunk/sys/fs/udf/udf_vnops.c	2018-05-27 22:07:49 UTC (rev 10019)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001, 2002 Scott Long <scottl at freebsd.org>
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/fs/udf/udf_vnops.c 278141 2015-02-03 08:03:19Z dim $
  */
 
 /* udf_vnops.c */
@@ -48,7 +49,6 @@
 
 #include <vm/uma.h>
 
-#include <fs/fifofs/fifo.h>
 #include <fs/udf/ecma167-udf.h>
 #include <fs/udf/osta.h>
 #include <fs/udf/udf.h>
@@ -481,7 +481,7 @@
 			if (lblktosize(udfmp, rablock) < fsize) {
 				error = cluster_read(vp, fsize, lbn, size,
 				    NOCRED, uio->uio_resid,
-				    (ap->a_ioflag >> 16), &bp);
+				    (ap->a_ioflag >> 16), 0, &bp);
 			} else {
 				error = bread(vp, lbn, size, NOCRED, &bp);
 			}
@@ -527,8 +527,9 @@
 		}
 
 		while (unilen > 0 && destleft > 0) {
-			udf_iconv->conv(udfmp->im_d2l, (const char **)&unibuf,
-				(size_t *)&unilen, (char **)&destname, &destleft);
+			udf_iconv->conv(udfmp->im_d2l, __DECONST(const char **,
+			    &unibuf), (size_t *)&unilen, (char **)&destname,
+			    &destleft);
 			/* Unconverted character found */
 			if (unilen > 0 && destleft > 0) {
 				*destname++ = '?';



More information about the Midnightbsd-cvs mailing list