From ee50a209a52adee27057315ce3a6216cfb7b718a Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Wed, 30 Jan 2013 13:53:09 -0500 Subject: [PATCH] New tag 2.3.60 Also another can kicking for LU-2449, hopefully last this time. Change-Id: I1455e48f1b557bc8787ef234e1894b0f9d7f4843 Signed-off-by: Oleg Drokin --- 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 1c1213a..959f596 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],[59]) +m4_define([LUSTRE_PATCH],[60]) 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 5fd9e0b..3119941 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, 60, 0) +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 61, 0) #warning "fix '.' and '..' handling" #endif -- 1.8.3.1