From 1f773208a4eee2088dc4707ebb904162978043de Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Mon, 31 Dec 2012 16:38:29 -0500 Subject: [PATCH] new tag 2.3.58 Change-Id: I69ef99e4ef58b9b88fc20dc5c94314520f8a98b2 --- lustre/autoconf/lustre-version.ac | 2 +- lustre/osd-zfs/osd_index.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac index fbe6dc2..9baf2ad 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],[57]) +m4_define([LUSTRE_PATCH],[58]) 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 cb865b5..220f397 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, 58, 0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 60, 0) #warning "fix '.' and '..' handling" #endif -- 1.8.3.1