diff -Nur linux-2.4.16/drivers/block/loop.c linux-int-2.4.16/drivers/block/loop.c
--- linux-2.4.16/drivers/block/loop.c   Mon Nov 19 23:48:02 2001
+++ linux-int-2.4.16/drivers/block/loop.c       Tue Dec  4 16:05:50 2001
@@ -85,7 +85,7 @@
 * Transfer functions
 */
static int transfer_none(struct loop_device *lo, int cmd, char *raw_buf,
-                        char *loop_buf, int size, int real_block)
+                        char *loop_buf, int size, loop_iv_t IV)
{
       if (raw_buf != loop_buf) {
               if (cmd == READ)
@@ -98,7 +98,7 @@
}

static int transfer_xor(struct loop_device *lo, int cmd, char *raw_buf,
-                       char *loop_buf, int size, int real_block)
+                       char *loop_buf, int size, loop_iv_t IV)
{
       char    *in, *out, *key;
       int     i, keysize;
@@ -186,7 +186,7 @@
       len = bh->b_size;
       data = bh->b_data;
       while (len > 0) {
-               int IV = index * (PAGE_CACHE_SIZE/bsize) + offset/bsize;
+               const loop_iv_t IV = (index << (PAGE_CACHE_SHIFT - LOOP_IV_SECTOR_BITS)) + (offset >> LOOP_IV_SECTOR_BITS);
               int transfer_result;

               size = PAGE_CACHE_SIZE - offset;
@@ -244,7 +244,7 @@
       unsigned long count = desc->count;
       struct lo_read_data *p = (struct lo_read_data*)desc->buf;
       struct loop_device *lo = p->lo;
-       int IV = page->index * (PAGE_CACHE_SIZE/p->bsize) + offset/p->bsize;
+       const loop_iv_t IV = (page->index << (PAGE_CACHE_SHIFT - LOOP_IV_SECTOR_BITS)) + (offset >> LOOP_IV_SECTOR_BITS);

       if (size > count)
               size = count;
@@ -296,20 +296,6 @@
       return bs;
}

-static inline unsigned long loop_get_iv(struct loop_device *lo,
-                                       unsigned long sector)
-{
-       int bs = loop_get_bs(lo);
-       unsigned long offset, IV;
-
-       IV = sector / (bs >> 9) + lo->lo_offset / bs;
-       offset = ((sector % (bs >> 9)) << 9) + lo->lo_offset % bs;
-       if (offset >= bs)
-               IV++;
-
-       return IV;
-}
-
static int do_bh_filebacked(struct loop_device *lo, struct buffer_head *bh, int rw)
{
       loff_t pos;
@@ -455,7 +441,7 @@
{
       struct buffer_head *bh = NULL;
       struct loop_device *lo;
-       unsigned long IV;
+       loop_iv_t IV;

       if (!buffer_locked(rbh))
               BUG();
@@ -502,7 +488,7 @@
        * piggy old buffer on original, and submit for I/O
        */
       bh = loop_get_buffer(lo, rbh);
-       IV = loop_get_iv(lo, rbh->b_rsector);
+       IV = rbh->b_rsector + (lo->lo_offset >> LOOP_IV_SECTOR_BITS);
       if (rw == WRITE) {
               set_bit(BH_Dirty, &bh->b_state);
               if (lo_do_transfer(lo, WRITE, bh->b_data, rbh->b_data,
@@ -539,7 +525,7 @@
               bh->b_end_io(bh, !ret);
       } else {
               struct buffer_head *rbh = bh->b_private;
-               unsigned long IV = loop_get_iv(lo, rbh->b_rsector);
+               const loop_iv_t IV = rbh->b_rsector + (lo->lo_offset >> LOOP_IV_SECTOR_BITS);

               ret = lo_do_transfer(lo, READ, bh->b_data, rbh->b_data,
                                    bh->b_size, IV);
diff -Nur linux-2.4.16/include/linux/loop.h linux-int-2.4.16/include/linux/loop.h
--- linux-2.4.16/include/linux/loop.h   Mon Sep 17 22:16:30 2001
+++ linux-int-2.4.16/include/linux/loop.h       Tue Dec  4 16:06:03 2001
@@ -17,6 +17,12 @@

#ifdef __KERNEL__

+/* definitions for IV metric */
+#define LOOP_IV_SECTOR_BITS 9
+#define LOOP_IV_SECTOR_SIZE (1 << LOOP_IV_SECTOR_BITS)
+
+typedef int loop_iv_t;
+
/* Possible states of device */
enum {
       Lo_unbound,
@@ -24,6 +30,12 @@
       Lo_rundown,
};

+struct loop_device;
+
+typedef        int (* transfer_proc_t)(struct loop_device *, int cmd,
+                               char *raw_buf, char *loop_buf, int size,
+                               loop_iv_t IV);
+
struct loop_device {
       int             lo_number;
       int             lo_refcnt;
@@ -32,9 +44,7 @@
       int             lo_encrypt_type;
       int             lo_encrypt_key_size;
       int             lo_flags;
-       int             (*transfer)(struct loop_device *, int cmd,
-                                   char *raw_buf, char *loop_buf, int size,
-                                   int real_block);
+       transfer_proc_t transfer;
       char            lo_name[LO_NAME_SIZE];
       char            lo_encrypt_key[LO_KEY_SIZE];
       __u32           lo_init[2];
@@ -58,17 +68,13 @@
       atomic_t                lo_pending;
};

-typedef        int (* transfer_proc_t)(struct loop_device *, int cmd,
-                               char *raw_buf, char *loop_buf, int size,
-                               int real_block);
-
static inline int lo_do_transfer(struct loop_device *lo, int cmd, char *rbuf,
-                                char *lbuf, int size, int rblock)
+                                char *lbuf, int size, loop_iv_t IV)
{
       if (!lo->transfer)
               return 0;

-       return lo->transfer(lo, cmd, rbuf, lbuf, size, rblock);
+       return lo->transfer(lo, cmd, rbuf, lbuf, size, IV);
}
#endif /* __KERNEL__ */

@@ -122,6 +128,8 @@
#define LO_CRYPT_IDEA     6
#define LO_CRYPT_DUMMY    9
#define LO_CRYPT_SKIPJACK 10
+#define LO_CRYPT_AES      16   /* loop-AES */
+#define LO_CRYPT_CRYPTOAPI 18  /* international crypto patch */
#define MAX_LO_CRYPT   20

#ifdef __KERNEL__
@@ -129,7 +137,7 @@
struct loop_func_table {
       int number;     /* filter type */
       int (*transfer)(struct loop_device *lo, int cmd, char *raw_buf,
-                       char *loop_buf, int size, int real_block);
+                       char *loop_buf, int size, loop_iv_t IV);
       int (*init)(struct loop_device *, struct loop_info *);
       /* release is called from loop_unregister_transfer or clr_fd */
       int (*release)(struct loop_device *);

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.