From: Hongchao Zhang Date: Mon, 3 Jun 2013 13:41:00 +0000 (+0800) Subject: staging/lustre/osc: check ostid if no OBD_CONNECT_FID X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6752a53e5cc75b6fa7ba040378b588d586551160;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git staging/lustre/osc: check ostid if no OBD_CONNECT_FID 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: https://jira.hpdd.intel.com/browse/LU-3360 Lustre-change: http://review.whamcloud.com/6426 Signed-off-by: Hongchao Zhang Reviewed-by: Oleg Drokin Reviewed-by: wangdi Reviewed-by: Andreas Dilger Signed-off-by: Peng Tao Signed-off-by: Andreas Dilger Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index a6cbb49fb8c4..8825460f12ac 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);