- add libiam.a (if exists) to rpm, this is neededfor testing our branch;

- replace all memcmp of fids by lu_fid_eq;
- allocate new fid for create case in ll_revalidate_it() in case of doing "goto do_lookup";
- removed needless lmv_fld_lookup() in lmv;
- fixed lmv_obj refcount management in error cases;
- comments are adjusted to be coherent with 80 columns style.

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index a88f0f1..c4c2365 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -464,6 +464,12 @@ fi
 AC_SUBST(LIBSYSIO_SUBDIR)
 AC_SUBST(SYSIO)
 
+RPM_LIBIAM_PATH=""
+if test -f lustre/utils/libiam.c; then
+        RPM_LIBIAM_PATH="%attr(-, root, root) %{_libdir}/libiam.a"
+fi
+AC_SUBST(RPM_LIBIAM_PATH)
+
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 3345eac..c0dee17 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -113,6 +113,7 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_libdir}/libptlctl.a
 %attr(-, root, root) %{_libdir}/liblustreapi.a
+@RPM_LIBIAM_PATH@
 %attr(-, root, root) /usr/include/lustre
 
 %attr(-, root, root) %{_mandir}/man?/*