← Back to branch summary

~yolanda.robla/ubuntu/saucy/iscsitarget/dep-8-tests

« back to all changes in this revision

Viewing changes to patches/compat-2.6.23.patch

  • Committer: Colin Watson
  • Date: 2010-08-16 20:59:52 UTC
  • mfrom: (2.1.9 sid)
  • Revision ID: cjwatson@canonical.com-20100816205952-hyytf817ju6wk1bj
merge from Debian 1.4.20.2-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/compat-2.6.23.patch
32
32
===================================================================
33
33
--- 1/kernel/config.c   (working copy)
34
34
+++ 2/kernel/config.c   (revision 145)
35
 
@@ -40,7 +40,7 @@ int iet_procfs_init(void)
 
35
@@ -42,7 +42,7 @@ int iet_procfs_init(void)
36
36
        int i;
37
37
        struct proc_dir_entry *ent;
38
38
 
150
150
        if (!nl)
151
151
                return -ENOMEM;
152
152
        else
 
153
--- param/kernel/volume.c       2010-03-03 13:41:36.000000000 -0500
 
154
+++ param/kernel/volume.c       2010-03-03 13:42:04.000000000 -0500
 
155
@@ -92,14 +92,13 @@ static void gen_scsiid(struct iet_volume
 
156
                struct scatterlist sg[2];
 
157
                unsigned int nbytes = 0;
 
158
 
 
159
-               sg_init_table(sg, 2);
 
160
-
 
161
-               sg_set_buf(&sg[0], volume->target->name,
 
162
-                                       strlen(volume->target->name));
 
163
-               nbytes += strlen(volume->target->name);
 
164
-
 
165
-               sg_set_buf(&sg[1], &volume->lun, sizeof(volume->lun));
 
166
-               nbytes += sizeof(volume->lun);
 
167
+               sg[0].page = virt_to_page(volume->target->name);
 
168
+               sg[0].offset = offset_in_page(volume->target->name);
 
169
+               nbytes += sg[0].length = strlen(volume->target->name);
 
170
+
 
171
+               sg[1].page = virt_to_page(&volume->lun);
 
172
+               sg[1].offset = offset_in_page(&volume->lun);
 
173
+               nbytes += sg[1].length = sizeof(volume->lun);
 
174
 
 
175
                crypto_hash_init(&hash);
 
176
                crypto_hash_update(&hash, sg, nbytes);