From: James Nunez Date: Mon, 8 Sep 2014 23:08:14 +0000 (-0600) Subject: LU-5596 lnet: Remove obsolete LNET variable X-Git-Tag: 2.6.53~55 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7ac8b9152fc910659906f9c355bcaa76996680de LU-5596 lnet: Remove obsolete LNET variable For Lustre version 2.6.50 and later, the variable session_features is defined as "LST_FEATS_MASK". For earlier versions of Lustre, the same variable is defined as "LST_FEATS_EMPTY. Since Lustre master is at 2.6.52 or later, the second definition of "session_features" can be removed. Signed-off-by: James Nunez Change-Id: I52e7a914880509cfcd4961032ab7775bbaf626a8 Reviewed-on: http://review.whamcloud.com/11825 Tested-by: Jenkins Reviewed-by: Isaac Huang Reviewed-by: Doug Oucharek Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index 044cbcd..1aacbda 100644 --- a/lnet/utils/lst.c +++ b/lnet/utils/lst.c @@ -50,19 +50,14 @@ lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; static lst_sid_t session_id; static int session_key; -#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 50, 0) -/* assume all nodes can understand feature LST_FEAT_BULK_LEN */ -static unsigned session_features = LST_FEATS_MASK; -#else -static unsigned session_features = LST_FEATS_EMPTY; -#endif - -static lstcon_trans_stat_t trans_stat; +/* All nodes running 2.6.50 or later understand feature LST_FEAT_BULK_LEN */ +static unsigned session_features = LST_FEATS_MASK; +static lstcon_trans_stat_t trans_stat; typedef struct list_string { - struct list_string *lstr_next; - int lstr_sz; - char lstr_str[0]; + struct list_string *lstr_next; + int lstr_sz; + char lstr_str[0]; } lstr_t; #ifndef offsetof