X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Flustre_linkea.h;h=1e07f3ae398dc2a8a624f2b993d7f49bde2c6c6c;hb=3e37d73b011ac1203c8cdd9f696652812bde5d2e;hp=acb8442930a9725ba90ca58d98b97e54f50c842c;hpb=f5491211ed7251a45e4e6916539cd2a2ab5e6038;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_linkea.h b/lustre/include/lustre_linkea.h
index acb8442..1e07f3a 100644
--- a/lustre/include/lustre_linkea.h
+++ b/lustre/include/lustre_linkea.h
@@ -52,8 +52,27 @@ void linkea_del_buf(struct linkea_data *ldata, const struct lu_name *lname);
 int linkea_links_find(struct linkea_data *ldata, const struct lu_name *lname,
 		      const struct lu_fid  *pfid);
 
-#define LINKEA_NEXT_ENTRY(ldata)	\
-	(struct link_ea_entry *)((char *)ldata.ld_lee + ldata.ld_reclen)
+static inline void linkea_first_entry(struct linkea_data *ldata)
+{
+	LASSERT(ldata != NULL);
+	LASSERT(ldata->ld_leh != NULL);
 
-#define LINKEA_FIRST_ENTRY(ldata)	\
-	(struct link_ea_entry *)(ldata.ld_leh + 1)
+	if (ldata->ld_leh->leh_reccount == 0)
+		ldata->ld_lee = NULL;
+	else
+		ldata->ld_lee = (struct link_ea_entry *)(ldata->ld_leh + 1);
+}
+
+static inline void linkea_next_entry(struct linkea_data *ldata)
+{
+	LASSERT(ldata != NULL);
+	LASSERT(ldata->ld_leh != NULL);
+
+	if (ldata->ld_lee != NULL) {
+		ldata->ld_lee = (struct link_ea_entry *)((char *)ldata->ld_lee +
+							 ldata->ld_reclen);
+		if ((char *)ldata->ld_lee >= ((char *)ldata->ld_leh +
+					      ldata->ld_leh->leh_len))
+			ldata->ld_lee = NULL;
+	}
+}