Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / include / linux / lnet / types.h

diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index e098b6c086e102c5f6ad4cec126c17dce2e394f4..f8be0e2f7bf7f72e40a5258b9c5745afc1273eca 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -503,21 +503,7 @@ typedef struct {
 /* NB lustre portals uses struct iovec internally! */
 typedef struct iovec lnet_md_iovec_t;
 
-/**
- * A page-based fragment of a MD.
- */
-typedef struct {
-       /** Pointer to the page where the fragment resides */
-       struct page     *kiov_page;
-       /** Length in bytes of the fragment */
-       unsigned int     kiov_len;
-       /**
-        * Starting offset of the fragment within the page. Note that the
-        * end of the fragment must not pass the end of the page; i.e.,
-        * kiov_len + kiov_offset <= PAGE_SIZE.
-        */
-       unsigned int     kiov_offset;
-} lnet_kiov_t;
+typedef struct bio_vec lnet_kiov_t;
 /** @} lnet_md */
 
 /** \addtogroup lnet_eq