LU-1581 utils: osd_read_ldd() wrapper

[fs/lustre-release.git] / lustre / utils / mount_utils_ldiskfs.c

diff --git a/lustre/utils/mount_utils_ldiskfs.c b/lustre/utils/mount_utils_ldiskfs.c
index 097e08e..4321bcb 100644 (file)
--- a/lustre/utils/mount_utils_ldiskfs.c
+++ b/lustre/utils/mount_utils_ldiskfs.c
@@ -156,12 +156,11 @@ out_rmdir:
        return ret;
 }
 
-int read_local_files(struct mkfs_opts *mop)
+int ldiskfs_read_ldd(char *dev, struct lustre_disk_data *mo_ldd)
 {
        char tmpdir[] = "/tmp/dirXXXXXX";
        char cmd[PATH_MAX];
        char filepnm[128];
-       char *dev;
        FILE *filep;
        int ret = 0;
        int cmdsz = sizeof(cmd);
@@ -173,8 +172,6 @@ int read_local_files(struct mkfs_opts *mop)
                return errno;
        }
 
-       dev = mop->mo_device;
-
        /* TODO: it's worth observing the get_mountdata() function that is
           in mount_utils.c for getting the mountdata out of the
           filesystem */
@@ -193,7 +190,7 @@ int read_local_files(struct mkfs_opts *mop)
        if (filep) {
                size_t num_read;
                vprint("Reading %s\n", MOUNT_DATA_FILE);
-               num_read = fread(&mop->mo_ldd, sizeof(mop->mo_ldd), 1, filep);
+               num_read = fread(mo_ldd, sizeof(*mo_ldd), 1, filep);
                if (num_read < 1 && ferror(filep)) {
                        fprintf(stderr, "%s: Unable to read from file %s: %s\n",
                                progname, filepnm, strerror(errno));