- local fs2mdsdev=${fs2mds_DEV:-${MDSDEV}_2}
- local fs2ostdev=${fs2ost_DEV:-$(ostdevname 1)_2}
- local fs3ostdev=${fs3ost_DEV:-$(ostdevname 2)_2}
- add fs2mds $MDS_MKFS_OPTS --fsname=${FSNAME2} --reformat $fs2mdsdev || exit 10
- # XXX after we support non 4K disk blocksize, change following --mkfsoptions with
- # other argument
- add fs2ost $OST_MKFS_OPTS --mkfsoptions='-b4096' --fsname=${FSNAME2} --mgsnode=$MGSNID --reformat $fs2ostdev || exit 10
- add fs3ost $OST_MKFS_OPTS --mkfsoptions='-b4096' --fsname=${FSNAME2} --mgsnode=$MGSNID --reformat $fs3ostdev || exit 10
+ local fs2mdsdev=$(mdsdevname 1_2)
+ local fs2ostdev=$(ostdevname 1_2)
+ local fs3ostdev=$(ostdevname 2_2)
+ local fs2mdsvdev=$(mdsvdevname 1_2)
+ local fs2ostvdev=$(ostvdevname 1_2)
+ local fs3ostvdev=$(ostvdevname 2_2)
+
+ add fs2mds $(mkfs_opts mds1) --fsname=${FSNAME2} --reformat \
+ $fs2mdsdev $fs2mdsvdev || exit 10
+ # XXX after we support non 4K disk blocksize in ldiskfs, specify a
+ # different one than the default value here.
+ add fs2ost $(mkfs_opts ost1) --mgsnode=$MGSNID --fsname=${FSNAME2} \
+ --reformat $fs2ostdev $fs2ostvdev || exit 10
+ add fs3ost $(mkfs_opts ost1) --mgsnode=$MGSNID --fsname=${FSNAME2} \
+ --reformat $fs3ostdev $fs3ostvdev || exit 10