openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File cloop-3.13.diff of Package cloop

From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-04-18 17:44:27.371956867 +0200

cloop: resolve build failure with Linux 3.13+

Linux kernel commit v3.13-rc1-8-g4550dd6 introduced biovecs
and rq_for_each_segment changed to taking a struct bio_vec without
indirection.

---
 cloop.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: cloop-2.639/cloop.c
===================================================================
--- cloop-2.639.orig/cloop.c
+++ cloop-2.639/cloop.c
@@ -292,12 +292,12 @@ static int cloop_handle_request(struct c
  int buffered_blocknum = -1;
  int preloaded = 0;
  loff_t offset     = (loff_t) blk_rq_pos(req)<<9; /* req->sector<<9 */
- struct bio_vec *bvec;
+ struct bio_vec bvec;
  struct req_iterator iter;
  rq_for_each_segment(bvec, req, iter)
   {
-   unsigned long len = bvec->bv_len;
-   char *to_ptr      = kmap(bvec->bv_page) + bvec->bv_offset;
+   unsigned long len = bvec.bv_len;
+   char *to_ptr      = kmap(bvec.bv_page) + bvec.bv_offset;
    while(len > 0)
     {
      u_int32_t length_in_buffer;
@@ -337,7 +337,7 @@ static int cloop_handle_request(struct c
      len         -= length_in_buffer;
      offset      += length_in_buffer;
     } /* while inner loop */
-   kunmap(bvec->bv_page);
+   kunmap(bvec.bv_page);
   } /* end rq_for_each_segment*/
  return ((buffered_blocknum!=-1) || preloaded);
 }

Places

File cloop-3.13.diff of Package cloop

Places