]) # LC_HAVE_LOCKS_LOCK_FILE_WAIT
#
+# LC_HAVE_QC_MAKE_REQUEST_FN
+#
+# 4.4 request_queue.make_request_fn defined as function returns with blk_qc_t
+# see kernel commit dece16353ef47d8d33f5302bc158072a9d65e26f
+#
+AC_DEFUN([LC_HAVE_QC_MAKE_REQUEST_FN], [
+LB_CHECK_COMPILE([if 'request_queue.make_request_fn' returns blk_qc_t],
+make_request_fn_blk_qc_t, [
+ #include <linux/blkdev.h>
+],[
+ blk_qc_t ret;
+ make_request_fn *mrf;
+ ret = mrf(NULL, NULL);
+],[
+ AC_DEFINE(HAVE_QC_MAKE_REQUEST_FN, 1,
+ [request_queue.make_request_fn returns blk_qc_t])
+])
+]) # LC_HAVE_QC_MAKE_REQUEST_FN
+
+#
# LC_PROG_LINUX
#
# Lustre linux kernel checks
# 4.4
LC_HAVE_LOCKS_LOCK_FILE_WAIT
+ LC_HAVE_QC_MAKE_REQUEST_FN
#
AS_IF([test "x$enable_server" != xno], [
return flag;
}
-#ifdef HAVE_VOID_MAKE_REQUEST_FN
-# define ll_mrf_ret void
-# define LL_MRF_RETURN(rc)
+#ifdef HAVE_QC_MAKE_REQUEST_FN
+# define ll_mrf_ret blk_qc_t
+# define LL_MRF_RETURN(rc) RETURN(BLK_QC_T_NONE)
#else
-# define ll_mrf_ret int
-# define LL_MRF_RETURN(rc) RETURN(rc)
+# ifdef HAVE_VOID_MAKE_REQUEST_FN
+# define ll_mrf_ret void
+# define LL_MRF_RETURN(rc)
+# else
+# define ll_mrf_ret int
+# define LL_MRF_RETURN(rc) RETURN(rc)
+# endif
#endif
#include <linux/fs.h>