Hello community, here is the log from the commit of package cloop for openSUSE:Factory checked in at 2014-05-13 20:43:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloop (Old) and /work/SRC/openSUSE:Factory/.cloop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloop" Changes: -------- --- /work/SRC/openSUSE:Factory/cloop/cloop.changes 2013-05-16 09:47:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cloop.new/cloop.changes 2014-05-13 20:43:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 18 15:49:57 UTC 2014 - [email protected] + +- Add cloop-3.13.diff to make cloop compile with Linux 3.13+ + +------------------------------------------------------------------- New: ---- cloop-3.13.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloop.spec ++++++ --- /var/tmp/diff_new_pack.xWGlN7/_old 2014-05-13 20:43:28.000000000 +0200 +++ /var/tmp/diff_new_pack.xWGlN7/_new 2014-05-13 20:43:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cloop # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source2: %name-preamble Patch1: cloop-kmod-install.diff Patch2: cloop-3.9.diff +Patch3: cloop-3.13.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: kernel-syms @@ -54,6 +55,9 @@ %prep %setup -q %patch -P 1 -P 2 -p1 +%if 0%{?suse_version} >= 1315 +%patch -P 3 -p1 +%endif %build # Setting CFLAGS is required here since it is not done implicitly ++++++ cloop-3.13.diff ++++++ From: Jan Engelhardt <[email protected]> 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); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
