[PATCH 23/23] staging/lustre/osc: check ostid if no OBD_CONNECT_FID

[Peng Tao]

From: Hongchao Zhang <hongchao.zhang at intel.com>

in lustre_set_wire_obdo, if "ocd->ocd_connect_flags" doesn't contain
OBD_CONNECT_FID, use "ost_id" to check the type of the object
instead of using ost_id.oi_fid only.

Intel-bug-id: LU-3360
Lustre-commit: fed98fbd8f0c84c8e757bea96bcc7c251b4ffe30
Lustre-change: http://review.whamcloud.com/6426
Signed-off-by: Hongchao Zhang <hongchao.zhang at intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin at intel.com>
Reviewed-by: wangdi <di.wang at intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger at intel.com>

[updated for upstream kernel submission]
Signed-off-by: Peng Tao <tao.peng at emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger at intel.com>
---
 .../lustre/lustre/include/lustre/lustre_idl.h      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index a6cbb49..8825460 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -3225,7 +3225,7 @@ static inline void lustre_set_wire_obdo(struct obd_connect_data *ocd,
 		return;
 
 	if (unlikely(!(ocd->ocd_connect_flags & OBD_CONNECT_FID)) &&
-	    fid_seq_is_echo(fid_seq(&lobdo->o_oi.oi_fid))) {
+	    fid_seq_is_echo(ostid_seq(&lobdo->o_oi))) {
 		/* Currently OBD_FL_OSTID will only be used when 2.4 echo
 		 * client communicate with pre-2.4 server */
 		wobdo->o_oi.oi.oi_id = fid_oid(&lobdo->o_oi.oi_fid);
-- 
1.7.9.5