From: Oleg Drokin <green@whamcloud.com>
Date: Mon, 19 Nov 2012 18:21:37 +0000 (-0500)
Subject: Restore build after a tag crossed imaginary line. tag 2.3.56
X-Git-Tag: 2.3.56^0
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e72ffc375fce680e3419906ed3cd255a0a694f31;ds=sidebyside

Restore build after a tag crossed imaginary line. tag 2.3.56

We need to find a better way to control such can-kicking excercises.

Change-Id: I25d8a2fbf7d5905c8f002a7c38fc44ef3124dda5
---

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 569189e..3a7aea6 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[2])
 m4_define([LUSTRE_MINOR],[3])
-m4_define([LUSTRE_PATCH],[55])
+m4_define([LUSTRE_PATCH],[56])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but
diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index 73d02a4..44ee79f 100644
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -536,7 +536,7 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
 	 * zfs_readdir() generates ./.. on fly, but
 	 * we want own entries (.. at least) with a fid
 	 */
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 55, 0)
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 57, 0)
 #warning "fix '.' and '..' handling"
 #endif