From fd4cee4cc545679d2a00c2a20939564e36700631 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Tue, 5 Jun 2012 12:50:41 +0400 Subject: [PATCH 1/1] LU-1581 utils: osd_make_lustre() wrapper a wrapper to prepare backend (basically mkfs for given type) Signed-off-by: Alex Zhuravlev Change-Id: I5ba5c7b5905de524bd0089671c753c3a5c44a9ec Reviewed-on: http://review.whamcloud.com/3222 Tested-by: Hudson Reviewed-by: Li Wei Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/utils/mkfs_lustre.c | 2 +- lustre/utils/mount_utils.c | 22 ++++++++++++++++++++++ lustre/utils/mount_utils.h | 2 ++ lustre/utils/mount_utils_ldiskfs.c | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c index 070cb20..25401d3 100644 --- a/lustre/utils/mkfs_lustre.c +++ b/lustre/utils/mkfs_lustre.c @@ -678,7 +678,7 @@ int main(int argc, char *const argv[]) } /* Format the backing filesystem */ - ret = make_lustre_backfs(&mop); + ret = osd_make_lustre(&mop); if (ret != 0) { fatal(); fprintf(stderr, "mkfs failed %d\n", ret); diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c index 4fb5ee0..8656474 100644 --- a/lustre/utils/mount_utils.c +++ b/lustre/utils/mount_utils.c @@ -411,6 +411,28 @@ int osd_is_lustre(char *dev, unsigned *mount_type) return 0; } +/* Build fs according to type */ +int osd_make_lustre(struct mkfs_opts *mop) +{ + struct lustre_disk_data *ldd = &mop->mo_ldd; + int ret; + + switch (ldd->ldd_mount_type) { + case LDD_MT_LDISKFS: + case LDD_MT_LDISKFS2: + ret = ldiskfs_make_lustre(mop); + break; + default: + fatal(); + fprintf(stderr, "unknown fs type %d '%s'\n", + ldd->ldd_mount_type, MT_STR(ldd)); + ret = EINVAL; + break; + } + + return ret; +} + int osd_prepare_lustre(struct mkfs_opts *mop, char *default_mountopts, int default_len, char *always_mountopts, int always_len) diff --git a/lustre/utils/mount_utils.h b/lustre/utils/mount_utils.h index 498d3ee..ad2f266 100644 --- a/lustre/utils/mount_utils.h +++ b/lustre/utils/mount_utils.h @@ -100,12 +100,14 @@ int loop_cleanup(struct mkfs_opts *mop); /* generic target support */ int osd_read_ldd(char *dev, struct lustre_disk_data *ldd); int osd_is_lustre(char *dev, unsigned *mount_type); +int osd_make_lustre(struct mkfs_opts *mop); int osd_prepare_lustre(struct mkfs_opts *mop, char *default_mountopts, int default_len, char *always_mountopts, int always_len); int ldiskfs_read_ldd(char *dev, struct lustre_disk_data *ldd); int ldiskfs_is_lustre(char *dev, unsigned *mount_type); +int ldiskfs_make_lustre(struct mkfs_opts *mop); int ldiskfs_prepare_lustre(struct mkfs_opts *mop, char *default_mountopts, int default_len, char *always_mountopts, int always_len); diff --git a/lustre/utils/mount_utils_ldiskfs.c b/lustre/utils/mount_utils_ldiskfs.c index 4321bcb..fe8be90 100644 --- a/lustre/utils/mount_utils_ldiskfs.c +++ b/lustre/utils/mount_utils_ldiskfs.c @@ -476,7 +476,7 @@ static char *moveopts_to_end(char *start) } /* Build fs according to type */ -int make_lustre_backfs(struct mkfs_opts *mop) +int ldiskfs_make_lustre(struct mkfs_opts *mop) { __u64 device_sz = mop->mo_device_sz, block_count = 0; char mkfs_cmd[PATH_MAX]; -- 1.8.3.1