> - /* If command type is WRITE or DISCARD, set bitmap as dirty */ > - if (ufshpb_is_write_or_discard(cmd)) { > + /* If command type is WRITE, set bitmap as dirty */ > + if (op_is_write(req_op(scsi_cmd_to_rq(cmd)))) { Umm, a driver has absolutely no business poking into the UNMAP payload. Someone needs to fix the UFS driver first to not do this.