From: Oleg Drokin Date: Wed, 6 Nov 2013 07:02:57 +0000 (-0500) Subject: New tag 2.5.51 X-Git-Tag: 2.5.51^0 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=14693fc046d310cebbeca6168d284cba56ece6a5;ds=sidebyside New tag 2.5.51 Change-Id: Ib4389ce656c878704b329472ab3a848e1aff6b53 --- diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac index 0d71979..7bfc9da 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],[5]) -m4_define([LUSTRE_PATCH],[50]) +m4_define([LUSTRE_PATCH],[51]) m4_define([LUSTRE_FIX],[0]) dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index a06abd3..a69d01d 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -821,7 +821,7 @@ static int ll_options(char *options, int *flags) *flags &= ~tmp; goto next; } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 51, 0) +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 53, 0) tmp = ll_set_opt("acl", s1, LL_SBI_ACL); if (tmp) { /* Ignore deprecated mount option. The client will