X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fll_dirstripe_verify.c;h=c41b567682098b984683489c7b94d9c148a9ad57;hb=437b35cb28e57a46e6dd60c45a643bfc73a8e189;hp=be20a72db24e95b563567fb55fb3127c6ed128c7;hpb=3b18568dc07dac8550c36b33afb45dde2403ea49;p=fs%2Flustre-release.git

diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
index be20a72..c41b567 100644
--- a/lustre/tests/ll_dirstripe_verify.c
+++ b/lustre/tests/ll_dirstripe_verify.c
@@ -51,14 +51,7 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include <liblustre.h>
-#include <obd.h>
-#include <lustre_lib.h>
 #include <lustre/lustreapi.h>
-#include <obd_lov.h>
-
-#include <lnet/lnetctl.h>
-
 
 #define MAX_LOV_UUID_COUNT      1000
 union {
@@ -240,13 +233,13 @@ int main(int argc, char **argv)
                 return 1;
         }
 
-        dir = opendir(argv[1]);
-        if (dir == NULL) {
-                rc = -errno;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "error: %s opendir failed\n", argv[1]);
-                return rc;
-        }
+	dir = opendir(argv[1]);
+	if (dir == NULL) {
+		rc = -errno;
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: %s opendir failed", argv[1]);
+		return rc;
+	}
 
 	lum_size = lov_user_md_size(MAX_LOV_UUID_COUNT, LOV_USER_MAGIC);
 	lum_dir = (struct lov_user_md *)malloc(lum_size);
@@ -258,61 +251,62 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 
-        rc = llapi_file_get_stripe(argv[1], lum_dir);
-        if (rc) {
-                if (rc == -ENODATA) {
-                        free(lum_dir);
-                        lum_dir = NULL;
-                } else {
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "error: can't get EA for %s\n", argv[1]);
-                        goto cleanup;
-                }
-        }
-
-        /* XXX should be llapi_lov_getname() */
-        rc = llapi_file_get_lov_uuid(argv[1], &lov_uuid);
-        if (rc) {
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "error: can't get lov name for %s\n",
-                            argv[1]);
-                return rc;
-        }
+	rc = llapi_file_get_stripe(argv[1], lum_dir);
+	if (rc) {
+		if (rc == -ENODATA) {
+			free(lum_dir);
+			lum_dir = NULL;
+		} else {
+			llapi_error(LLAPI_MSG_ERROR, rc,
+				    "error: can't get EA for %s", argv[1]);
+			goto cleanup;
+		}
+	}
 
-        if ((lum_file1 = (struct lov_user_md *)malloc(lum_size)) == NULL) {
-                rc = -ENOMEM;
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "error: can't allocate %d bytes for EA\n",
-                            lum_size);
-                goto cleanup;
-        }
+	/* XXX should be llapi_lov_getname() */
+	rc = llapi_file_get_lov_uuid(argv[1], &lov_uuid);
+	if (rc) {
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: can't get lov name for %s",
+			    argv[1]);
+		return rc;
+	}
 
-        rc = llapi_file_get_stripe(argv[2], lum_file1);
-        if (rc) {
-                llapi_error(LLAPI_MSG_ERROR, rc,
-                            "error: unable to get EA for %s\n", argv[2]);
-                goto cleanup;
-        }
+	lum_file1 = malloc(lum_size);
+	if (lum_file1 == NULL) {
+		rc = -ENOMEM;
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: can't allocate %d bytes for EA",
+			    lum_size);
+		goto cleanup;
+	}
 
-        if (argc == 4) {
-                lum_file2 = (struct lov_user_md *)malloc(lum_size);
-                if (lum_file2 == NULL) {
-                        rc = -ENOMEM;
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "error: can't allocate %d "
-                                    "bytes for file2 EA\n", lum_size);
-                        goto cleanup;
-                }
+	rc = llapi_file_get_stripe(argv[2], lum_file1);
+	if (rc) {
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: unable to get EA for %s", argv[2]);
+		goto cleanup;
+	}
 
-                rc = llapi_file_get_stripe(argv[3], lum_file2);
-                if (rc) {
-                        llapi_error(LLAPI_MSG_ERROR, rc,
-                                    "error: can't get EA for %s\n", argv[3]);
-                        goto cleanup;
-                }
-        }
+	if (argc == 4) {
+		lum_file2 = (struct lov_user_md *)malloc(lum_size);
+		if (lum_file2 == NULL) {
+			rc = -ENOMEM;
+			llapi_error(LLAPI_MSG_ERROR, rc,
+				    "error: can't allocate %d "
+				    "bytes for file2 EA", lum_size);
+			goto cleanup;
+		}
+
+		rc = llapi_file_get_stripe(argv[3], lum_file2);
+		if (rc) {
+			llapi_error(LLAPI_MSG_ERROR, rc,
+				    "error: can't get EA for %s", argv[3]);
+			goto cleanup;
+		}
+	}
 
-        rc = compare(lum_dir, lum_file1, lum_file2);
+	rc = compare(lum_dir, lum_file1, lum_file2);
 
 cleanup:
         closedir(dir);