LU-1581 utils: introduce osd_is_lustre() 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 86f9ef5..097e08e 100644 (file)
--- a/lustre/utils/mount_utils_ldiskfs.c
+++ b/lustre/utils/mount_utils_ldiskfs.c
@@ -277,31 +277,26 @@ static int file_in_dev(char *file_name, char *dev_name)
 }
 
 /* Check whether the device has already been used with lustre */
-int is_lustre_target(struct mkfs_opts *mop)
+int ldiskfs_is_lustre(char *dev, unsigned *mount_type)
 {
-       int rc;
-
-       vprint("checking for existing Lustre data: ");
+       int ret;
 
-       if ((rc = file_in_dev(MOUNT_DATA_FILE, mop->mo_device))) {
-               vprint("found %s\n",
-                      (rc == 1) ? MOUNT_DATA_FILE : "extents");
-               /* in the -1 case, 'extents' means this really IS a lustre
-                  target */
-               return rc;
+       ret = file_in_dev(MOUNT_DATA_FILE, dev);
+       if (ret) {
+               /* in the -1 case, 'extents' means IS a lustre target */
+               *mount_type = LDD_MT_LDISKFS;
+               return 1;
        }
 
-       if ((rc = file_in_dev(LAST_RCVD, mop->mo_device))) {
-               vprint("found %s\n", LAST_RCVD);
-               return rc;
+       ret = file_in_dev(LAST_RCVD, dev);
+       if (ret) {
+               *mount_type = LDD_MT_LDISKFS;
+               return 1;
        }
 
-       vprint("not found\n");
-       return 0; /* The device is not a lustre target. */
+       return 0;
 }
 
-
-
 /* Check if a certain feature is supported by e2fsprogs.
  * Firstly we try to use "debugfs supported_features" command to check if
  * the feature is supported. If this fails we try to set this feature with