From owner-svn-soc-all@FreeBSD.ORG Fri Jun 29 21:15:55 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id AA595106564A for ; Fri, 29 Jun 2012 21:15:53 +0000 (UTC) (envelope-from oleksandr@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 29 Jun 2012 21:15:53 +0000 Date: Fri, 29 Jun 2012 21:15:53 +0000 From: oleksandr@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120629211553.AA595106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r238607 - soc2012/oleksandr/udf-head/sys/fs/udf2 X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 21:15:55 -0000 Author: oleksandr Date: Fri Jun 29 21:15:53 2012 New Revision: 238607 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238607 Log: change field sector_size in struct udf_mount to appropriate field in mmc_discinfo, and remove unused fields in udf_mount Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf.h soc2012/oleksandr/udf-head/sys/fs/udf2/udf_readwrite.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf.h ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf.h Fri Jun 29 20:15:00 2012 (r238606) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf.h Fri Jun 29 21:15:53 2012 (r238607) @@ -256,7 +256,6 @@ struct g_consumer *geomcp; struct bufobj *bo; struct mmc_discinfo discinfo; - uint32_t sector_size; struct udf_args mount_args; int flags; @@ -266,11 +265,6 @@ void *iconv_l2d; /* local to disk */ #endif - /* Used in mounting */ - uint32_t first_trackblank; - uint32_t session_start; - uint32_t session_end; - /* format descriptors */ /* kmutex_t logvol_mutex; */ /* Who needs locks... */ struct anchor_vdp *anchors[UDF_ANCHORS]; /* anchors to VDS */ Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_readwrite.c ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_readwrite.c Fri Jun 29 20:15:00 2012 (r238606) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_readwrite.c Fri Jun 29 21:15:53 2012 (r238607) @@ -261,7 +261,7 @@ uint32_t sector_size, blkinsect, fileblk, fileblkoff, numlsect, numb; uint8_t *pos; - sector_size = unode->ump->sector_size; + sector_size = unode->ump->discinfo.sector_size; blkinsect = sector_size / DEV_BSIZE; if (unode->fe) { @@ -336,7 +336,7 @@ uint32_t sector_size, blks; /* buf_offset; */ struct vnode *devvp = ump->devvp; - sector_size = ump->sector_size; + sector_size = ump->discinfo.sector_size; blks = btodb(sector_size); while (sectors > 0 && error == 0) { @@ -418,7 +418,7 @@ int sectors, dscrlen, i, error, sector_size; uint8_t *pos; - sector_size = ump->sector_size; + sector_size = ump->discinfo.sector_size; *dstp = dst = NULL; dscrlen = sector_size; Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c Fri Jun 29 20:15:00 2012 (r238606) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_subr.c Fri Jun 29 21:15:53 2012 (r238607) @@ -1970,7 +1970,7 @@ */ /* check logical volume sector size verses device sector size */ - if (le32toh(ump->logical_vol->lb_size) != ump->sector_size) { + if (le32toh(ump->logical_vol->lb_size) != ump->discinfo.sector_size) { printf("UDF mount: format violation, lb_size != sector size\n"); return (EINVAL); } @@ -3410,7 +3410,7 @@ dscr = NULL; /* continue to the next fsd */ - fsd_len -= ump->sector_size; + fsd_len -= ump->discinfo.sector_size; fsd_loc.loc.lb_num = htole32(le32toh(fsd_loc.loc.lb_num)+1); /* follow up to fsd->next_ex (long_ad) if its not null */ @@ -6469,7 +6469,7 @@ /* get extent and do some paranoia checks */ ump = node->ump; - sector_size = ump->sector_size; + sector_size = ump->discinfo.sector_size; if (fe) { inflen = le64toh(fe->inf_len); Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c Fri Jun 29 20:15:00 2012 (r238606) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c Fri Jun 29 21:15:53 2012 (r238607) @@ -522,8 +522,7 @@ } /* inspect sector size */ - ump->sector_size = cp->provider->sectorsize; - sector_size = ump->sector_size; + sector_size = ump->discinfo.sector_size; bshift = 1; while ((1 << bshift) < sector_size) bshift++; @@ -728,8 +727,8 @@ sbp->f_version = STATFS_VERSION; /* structure version number */ /*uint32_t f_type;*/ /* type of filesystem */ sbp->f_flags = mp->mnt_flag; /* copy of mount exported flags */ - sbp->f_bsize = ump->sector_size; /* filesystem fragment size */ - sbp->f_iosize = ump->sector_size; /* optimal transfer block size */ + sbp->f_bsize = ump->discinfo.sector_size; /* filesystem fragment size */ + sbp->f_iosize = ump->discinfo.sector_size; /* optimal transfer block size */ sbp->f_blocks = sizeblks; /* total data blocks in filesystem */ sbp->f_bfree = freeblks; /* free blocks in filesystem */ sbp->f_bavail = 0; /* free blocks avail to non-superuser */ Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c ============================================================================== --- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Fri Jun 29 20:15:00 2012 (r238606) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vnops.c Fri Jun 29 21:15:53 2012 (r238607) @@ -231,12 +231,12 @@ n = min(file_size - uio->uio_offset, uio->uio_resid); - lbn = uio->uio_offset / udf_node->ump->sector_size; - on = uio->uio_offset % udf_node->ump->sector_size; - n = min(udf_node->ump->sector_size - on, uio->uio_resid); + lbn = uio->uio_offset / udf_node->ump->discinfo.sector_size; + on = uio->uio_offset % udf_node->ump->discinfo.sector_size; + n = min(udf_node->ump->discinfo.sector_size - on, uio->uio_resid); n = min(n, file_size - uio->uio_offset); - error = bread(vp, lbn, udf_node->ump->sector_size, NOCRED, &bp); - n = min(n, udf_node->ump->sector_size - bp->b_resid); + error = bread(vp, lbn, udf_node->ump->discinfo.sector_size, NOCRED, &bp); + n = min(n, udf_node->ump->discinfo.sector_size - bp->b_resid); if (!error) error = uiomove(bp->b_data + on, n, uio); @@ -442,7 +442,7 @@ else if (lsector == UDF_TRANS_ZERO) *ap->a_bnp = -1; /* zero the buffer */ else - *ap->a_bnp = lsector * (udf_node->ump->sector_size/DEV_BSIZE); + *ap->a_bnp = lsector * (udf_node->ump->discinfo.sector_size/DEV_BSIZE); /* set runlength of maximum block size */ if (ap->a_runp) @@ -480,7 +480,7 @@ /* assert(bp->b_blkno >= 0);*/ /* get sector size */ - lb_size = udf_node->ump->sector_size; + lb_size = udf_node->ump->discinfo.sector_size; /* calculate sector to start from */ from = bp->b_blkno; @@ -520,7 +520,7 @@ bufwait(bp); } else { /* bmap gives sector numbers. bio works with device blocks */ - bp->b_blkno = lsector * (udf_node->ump->sector_size/DEV_BSIZE); + bp->b_blkno = lsector * (udf_node->ump->discinfo.sector_size/DEV_BSIZE); bp->b_iooffset = dbtob(bp->b_blkno); BO_STRATEGY(bo, bp); } @@ -782,7 +782,7 @@ nchstats.ncs_2passes++; } - fid = malloc(ump->sector_size, M_UDFTEMP, M_WAITOK); + fid = malloc(ump->discinfo.sector_size, M_UDFTEMP, M_WAITOK); unix_name = malloc(MAXNAMLEN, M_UDFTEMP, M_WAITOK); lookuploop: while (offset < file_size) { @@ -967,9 +967,9 @@ /* directories should be at least a single block? */ if (blkssize != 0) - filesize = blkssize * ump->sector_size; + filesize = blkssize * ump->discinfo.sector_size; else - filesize = ump->sector_size; + filesize = ump->discinfo.sector_size; } /* fill in struct vattr with values from the node */ @@ -982,7 +982,7 @@ vap->va_fsid = dev2udev(ump->dev); /* vp->v_mount->mnt_stat.f_fsidx.__fsid_val[0]; */ vap->va_fileid = udf_get_node_id(&udf_node->loc); /* inode hash XXX */ vap->va_size = filesize; - vap->va_blocksize = ump->sector_size; /* wise? */ + vap->va_blocksize = ump->discinfo.sector_size; /* wise? */ /* access times */ udf_timestamp_to_timespec(ump, atime, &vap->va_atime); @@ -992,7 +992,7 @@ vap->va_gen = 1; /* no multiple generations yes (!?) */ vap->va_flags = 0; /* no flags */ - vap->va_bytes = blkssize * ump->sector_size; + vap->va_bytes = blkssize * ump->discinfo.sector_size; vap->va_filerev = 0; /* TODO file revision numbers? This was changed from a 1. */ vap->va_vaflags = 0;