always use the new partition scheme. (it's >5 years old, so it's time to commit.) Reference: /n/atom/patch/applied/fspartmerge Date: Wed Apr 16 04:24:03 CES 2014 Signed-off-by: quanstro@quanstro.net # rm /sys/src/fs/dev/mworm2.c --- /sys/src/fs/aska/mkfile Wed Apr 16 04:22:49 2014 +++ /sys/src/fs/aska/mkfile Wed Apr 16 04:22:50 2014 @@ -17,7 +17,7 @@ # fworm.$O\ fjuke.$O\ # juke.$O\ - mworm2.$O\ + mworm.$O\ part.$O\ # wren.$O\ # swab.$O\ --- /sys/src/fs/buda/mkfile Wed Apr 16 04:22:51 2014 +++ /sys/src/fs/buda/mkfile Wed Apr 16 04:22:52 2014 @@ -14,6 +14,7 @@ fworm.$O\ fjuke.$O\ mworm.$O\ + part.$O\ wren.$O\ IP=\ --- /sys/src/fs/fairyland/mkfile Wed Apr 16 04:22:53 2014 +++ /sys/src/fs/fairyland/mkfile Wed Apr 16 04:22:54 2014 @@ -9,18 +9,13 @@ TARG=$p$CONF'fs' DEV=\ -# apc.$O\ aoe.$O\ cw.$O\ devio.$O\ devtab.$O\ -# fworm.$O\ fjuke.$O\ -# juke.$O\ - mworm2.$O\ + mworm.$O\ part.$O\ -# wren.$O\ -# swab.$O\ IP=\ arp.$O\ @@ -80,7 +75,8 @@ etherctlr.$O\ # ether83815.$O\ # etherigbe.$O\ -# ethermii.$O\ + ethermii.$O\ + ether8169.$O\ ether82563.$O\ # etherm10g.$O\ ether82598.$O\ --- /sys/src/fs/fs/mkfile Wed Apr 16 04:22:55 2014 +++ /sys/src/fs/fs/mkfile Wed Apr 16 04:22:56 2014 @@ -17,6 +17,7 @@ fworm.$O\ fjuke.$O\ mworm.$O\ + part.$O\ wren.$O\ IP=\ --- /sys/src/fs/fs64/mkfile Wed Apr 16 04:22:58 2014 +++ /sys/src/fs/fs64/mkfile Wed Apr 16 04:22:58 2014 @@ -17,6 +17,7 @@ fworm.$O\ fjuke.$O\ mworm.$O\ + part.$O\ wren.$O\ IP=\ --- /sys/src/fs/ila/mkfile Wed Apr 16 04:23:00 2014 +++ /sys/src/fs/ila/mkfile Wed Apr 16 04:23:01 2014 @@ -18,6 +18,7 @@ fjuke.$O\ # juke.$O\ mworm.$O\ + part.$O\ # wren.$O\ # swab.$O\ --- /sys/src/fs/ivey/mkfile Wed Apr 16 04:23:02 2014 +++ /sys/src/fs/ivey/mkfile Wed Apr 16 04:23:03 2014 @@ -9,17 +9,13 @@ TARG=$p$CONF'fs' DEV=\ -# apc.$O\ aoe.$O\ cw.$O\ devio.$O\ devtab.$O\ -# fworm.$O\ fjuke.$O\ -# juke.$O\ - mworm2.$O\ + mworm.$O\ part.$O\ -# wren.$O\ IP=\ arp.$O\ --- /sys/src/fs/wrens/mkfile Wed Apr 16 04:23:04 2014 +++ /sys/src/fs/wrens/mkfile Wed Apr 16 04:23:05 2014 @@ -17,7 +17,7 @@ # fworm.$O\ fjuke.$O\ # juke.$O\ - mworm2.$O\ + mworm.$O\ part.$O\ # wren.$O\ # swab.$O\ --- /sys/src/fs/dev/mworm.c Wed Apr 16 04:23:07 2014 +++ /sys/src/fs/dev/mworm.c Wed Apr 16 04:23:08 2014 @@ -149,79 +149,6 @@ } /* - * partition device; this is a crock! - */ -void -partinit(Device *d) -{ - devinit(d->part.d); - d->part.d->size = devsize(d->part.d); -} - -Devsize -partsize(Device *d) -{ - Devsize size, l; - - if(d->part.size < 101){ - l = d->part.d->size / 100; - size = d->part.size * l; - if(size == 0) - size = l*100; - }else - size = d->part.size; - return size; -} - -int -partread(Device *d, Off b, void *c) -{ - Devsize base, size, l; - - if(d->part.size < 101){ - l = d->part.d->size / 100; - base = d->part.base * l; - size = d->part.size * l; - if(size == 0) - size = l*100; - }else{ - base = d->part.base; - size = d->part.size; - } - if(b < size) - return devread(d->part.d, base+b, c); - print("partread %lld %lld\n", (Wideoff)b, (Wideoff)size); - return 1; -} - -int -partwrite(Device *d, Off b, void *c) -{ - Devsize base, size, l; - - if(d->part.size < 101){ - l = d->part.d->size / 100; - base = d->part.base * l; - size = d->part.size * l; - if(size == 0) - size = l*100; - }else{ - base = d->part.base; - size = d->part.size; - } - if(b < size) - return devwrite(d->part.d, base+b, c); - print("partwrite %lld %lld\n", (Wideoff)b, (Wideoff)size); - return 1; -} - -void -partream(Device *d, int) -{ - devream(d->part.d, 0); -} - -/* * mirror device */ void