socsvn commit: r238983 - soc2012/oleksandr/udf-head/sys/fs/udf2

[oleksandr at FreeBSD.org]

Author: oleksandr
Date: Wed Jul  4 23:12:59 2012
New Revision: 238983
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238983

Log:
  read parameter -g and -u from mount options and remove commented code, fix translated UDF filetypes

Modified:
  soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c

Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c
==============================================================================
--- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c	Wed Jul  4 22:12:10 2012	(r238982)
+++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c	Wed Jul  4 23:12:59 2012	(r238983)
@@ -421,7 +421,7 @@
 	int    num_anchors, error, len, *udf_flags;
 	uint32_t bshift, logvol_integrity, sector_size; /*lb_size,*/
 	char *cs_disk, *cs_local;
-//	void *optdata;
+	void *optdata;
 
 #if 0
 	/* flush out any old buffers remaining from a previous use. */
@@ -481,9 +481,6 @@
 	ump->geomcp = cp;
 	ump->bo = &devvp->v_bufobj;
 	
-	/* set up arguments and device */
-//	ump->mount_args = *args;
-
 	/* Load flags for later.  Not sure what to use them for... */
 	udf_flags = NULL;
 	error = vfs_getopt(opts, "flags", (void **)&udf_flags, &len);
@@ -491,38 +488,20 @@
 		return (EINVAL);
 	ump->flags = *udf_flags;
 	
-	/* read in disk info from options */
-	ump->mount_args.anon_uid = 0;
-	ump->mount_args.anon_gid = 0;
-	ump->mount_args.nobody_uid = -1;
-	ump->mount_args.nobody_gid = -1;
-#if 0
-	optdata = NULL;
-	error = vfs_getopt(opts, "first_trackblank", &optdata, &len);
-	if (error || len != sizeof(uint32_t)) {
-		error = EINVAL;
-		goto fail;
-	}
-	ump->first_trackblank = *(uint32_t *)optdata;
-	
-	optdata = NULL;
-	error = vfs_getopt(opts, "session_start_addr", &optdata, &len);
-	if (error || len != sizeof(uint32_t)) {
+	optdata = NULL;	
+	error = vfs_getopt(opts, "udf_args", &optdata, &len);
+	if (error || len != sizeof(struct udf_args)) {
 		error = EINVAL;
 		goto fail;
 	}
-	ump->session_start = *(uint32_t *)optdata;
 
-	optdata = NULL;
-	error = vfs_getopt(opts, "session_end_addr", &optdata, &len);
-	if (error || len != sizeof(uint32_t)) {
-		error = EINVAL;
-		goto fail;
-	}
-	ump->session_end = *(uint32_t *)optdata;
+	/* set up arguments and device */
+	ump->mount_args = *(struct udf_argRNO) == 0)
+		(kgdb)
+		140                             td->td_errno = error;
+	(kgdb)
+		148                     if (systrace_probe_func !=:
 
-	ump->last_possible_vat_location = ump->session_end;
-#endif
 	if (ump->flags & UDFMNT_KICONV && udf2_iconv) {
 		cs_disk = "UTF-16BE";
 
@@ -965,8 +944,7 @@
 		nvp->v_type = VREG;
 		break;
 	default:
-		/* YIKES, something else */
-		nvp->v_type = VNON;
+		nvp->v_type = VBAD;
 	}
 
 	/* TODO specfs, fifofs etc etc. vnops setting */