X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fll_recover_lost_found_objs.c;h=cd9a6f4e9d587a26d9794f4590af71ffa20dd37e;hb=eaf3353fce3384e21b1310c2feb847a7c01eb131;hp=b7250b293f44dff2e1f58f165d73a32e38302a04;hpb=f86463356d9460cc79327d6fc7d2fc8db782e3cb;p=fs%2Flustre-release.git

diff --git a/lustre/utils/ll_recover_lost_found_objs.c b/lustre/utils/ll_recover_lost_found_objs.c
index b7250b2..cd9a6f4 100644
--- a/lustre/utils/ll_recover_lost_found_objs.c
+++ b/lustre/utils/ll_recover_lost_found_objs.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,7 +57,7 @@
 #include <sys/xattr.h>
 #include <sys/stat.h>
 
-#include <liblustre.h>
+#include <lustre/lustre_idl.h>
 #include <libcfs/list.h>
 
 #define MAX_GROUPS 64
@@ -66,19 +66,19 @@ int verbose;
 bool dry_run;
 
 struct obd_group_info {
-	__u64		grp_last_id;
-	__u64		grp_seq;
-	cfs_list_t	grp_list;
+	__u64			grp_last_id;
+	__u64			grp_seq;
+	struct list_head	grp_list;
 };
 
-cfs_list_t grp_info_list;
+struct list_head grp_info_list;
 
-static void grp_info_list_destroy(cfs_list_t *list)
+static void grp_info_list_destroy(struct list_head *list)
 {
 	struct obd_group_info *grp, *tmp;
 
-	cfs_list_for_each_entry_safe(grp, tmp, list, grp_list) {
-		cfs_list_del_init(&grp->grp_list);
+	list_for_each_entry_safe(grp, tmp, list, grp_list) {
+		list_del_init(&grp->grp_list);
 		free(grp);
 	}
 }
@@ -189,18 +189,18 @@ static __u64 read_last_id(char *file_path)
 	return le64_to_cpu(last_id);
 }
 
-struct obd_group_info *find_or_create_grp(cfs_list_t *list, __u64 seq,
+struct obd_group_info *find_or_create_grp(struct list_head *list, __u64 seq,
 					  const char *mount)
 {
 	struct obd_group_info	*grp;
-	cfs_list_t		*entry;
+	struct list_head	*entry;
 	char			tmp_path[PATH_MAX];
 	char			seq_name[32];
 	int			retval;
 	__u64			tmp_last_id;
 
-	cfs_list_for_each(entry, list) {
-		grp = (struct obd_group_info *)cfs_list_entry(entry,
+	list_for_each(entry, list) {
+		grp = (struct obd_group_info *)list_entry(entry,
 						struct obd_group_info,
 						grp_list);
 		if (grp->grp_seq == seq)
@@ -247,7 +247,7 @@ struct obd_group_info *find_or_create_grp(cfs_list_t *list, __u64 seq,
 	grp->grp_last_id = tmp_last_id;
 	grp->grp_seq = seq;
 
-	cfs_list_add(&grp->grp_list, list);
+	list_add(&grp->grp_list, list);
 	return grp;
 }
 
@@ -638,7 +638,7 @@ int main(int argc, char **argv)
 		return 1;
         }
 
-	CFS_INIT_LIST_HEAD(&grp_info_list);
+	INIT_LIST_HEAD(&grp_info_list);
 	rc = traverse_lost_found(src_dir, mount_path);
 	if (rc) {
 		fprintf(stderr, "error: traversing lost+found looking for "