lustre: simplify the living hell out of ksocknal_lib_recv_kiov()

[cascardo/linux.git] / drivers / staging / lustre / lnet / klnds / socklnd / socklnd.h

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index a56632b..d5efb42 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -86,8 +86,10 @@ struct ksock_sched {                         /* per scheduler state */
        int                     kss_nconns;     /* # connections assigned to
                                                 * this scheduler */
        struct ksock_sched_info *kss_info;      /* owner of it */
-       struct page             *kss_rx_scratch_pgs[LNET_MAX_IOV];
-       struct kvec             kss_scratch_iov[LNET_MAX_IOV];
+       union {
+               struct bio_vec          kss_scratch_bvec[LNET_MAX_IOV];
+               struct kvec             kss_scratch_iov[LNET_MAX_IOV];
+       };
 };
 
 struct ksock_sched_info {