SOURCES: patch-cryptoloop-jari-2.4.22-rc2.0, linux-2.4.20-EXPORT_S...
qboosh
qboosh at pld-linux.org
Thu Nov 23 10:23:04 CET 2006
Author: qboosh Date: Thu Nov 23 09:23:04 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.4.33.4
---- Files affected:
SOURCES:
patch-cryptoloop-jari-2.4.22-rc2.0 (1.6 -> 1.7) , linux-2.4.20-EXPORT_SYMBOL.patch (1.24 -> 1.25)
---- Diffs:
================================================================
Index: SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0
diff -u SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0:1.6 SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0:1.7
--- SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0:1.6 Thu Jul 20 14:28:20 2006
+++ SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0 Thu Nov 23 10:22:59 2006
@@ -206,9 +206,8 @@
+
+module_init(init_cryptoloop);
+module_exit(cleanup_cryptoloop);
-diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
---- linux-2.4/drivers/block/loop.c 2003-08-16 19:11:44.513638284 +0200
-+++ linux-2.4-cl/drivers/block/loop.c 2003-08-16 19:38:49.487870443 +0200
+--- linux-2.4.33.4/drivers/block/loop.c.orig 2006-11-23 09:50:27.259505000 +0100
++++ linux-2.4.33.4/drivers/block/loop.c 2006-11-23 09:59:35.719505000 +0100
@@ -52,6 +52,18 @@
* problem above. Encryption modules that used to rely on the old scheme
* should just call ->i_mapping->bmap() to calculate the physical block
@@ -1255,10 +1254,10 @@
+ loop_set_softblksz(lo, dev);
- lo->lo_bh = lo->lo_bhtail = NULL;
- kernel_thread(loop_thread, lo, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
- down(&lo->lo_sem);
-
-@@ -751,11 +927,12 @@
+ error = kernel_thread(loop_thread, lo,
+ CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+ if (error < 0)
+@@ -762,11 +938,12 @@
spin_lock_irq(&lo->lo_lock);
lo->lo_state = Lo_rundown;
if (atomic_dec_and_test(&lo->lo_pending))
@@ -1272,7 +1271,7 @@
lo->lo_backing_file = NULL;
loop_release_xfer(lo);
-@@ -770,14 +947,15 @@
+@@ -781,14 +958,15 @@
memset(lo->lo_name, 0, LO_NAME_SIZE);
loop_sizes[lo->lo_number] = 0;
invalidate_bdev(bdev, 0);
@@ -1290,7 +1289,7 @@
{
struct loop_info info;
int err;
-@@ -817,6 +995,7 @@
+@@ -828,6 +1006,7 @@
lo->lo_key_owner = current->uid;
}
figure_loop_size(lo);
@@ -1298,7 +1297,7 @@
return 0;
}
-@@ -872,7 +1051,7 @@
+@@ -883,7 +1062,7 @@
err = loop_clr_fd(lo, inode->i_bdev);
break;
case LOOP_SET_STATUS:
@@ -1307,7 +1306,7 @@
break;
case LOOP_GET_STATUS:
err = loop_get_status(lo, (struct loop_info *) arg);
-@@ -905,7 +1084,7 @@
+@@ -917,7 +1096,7 @@
static int lo_open(struct inode *inode, struct file *file)
{
struct loop_device *lo;
@@ -1316,7 +1315,7 @@
if (!inode)
return -EINVAL;
-@@ -920,10 +1099,6 @@
+@@ -932,10 +1111,6 @@
lo = &loop_dev[dev];
MOD_INC_USE_COUNT;
down(&lo->lo_ctl_mutex);
@@ -1327,7 +1326,7 @@
lo->lo_refcnt++;
up(&lo->lo_ctl_mutex);
return 0;
-@@ -932,7 +1107,7 @@
+@@ -944,7 +1119,7 @@
static int lo_release(struct inode *inode, struct file *file)
{
struct loop_device *lo;
@@ -1336,7 +1335,7 @@
if (!inode)
return 0;
-@@ -947,11 +1122,7 @@
+@@ -959,11 +1134,7 @@
lo = &loop_dev[dev];
down(&lo->lo_ctl_mutex);
@@ -1348,7 +1347,7 @@
up(&lo->lo_ctl_mutex);
MOD_DEC_USE_COUNT;
return 0;
-@@ -1016,10 +1187,9 @@
+@@ -1028,10 +1199,9 @@
return -EIO;
}
@@ -1360,7 +1359,7 @@
loop_sizes = kmalloc(max_loop * sizeof(int), GFP_KERNEL);
if (!loop_sizes)
-@@ -1029,6 +1199,10 @@
+@@ -1041,6 +1211,10 @@
if (!loop_blksizes)
goto out_blksizes;
@@ -1371,7 +1370,7 @@
blk_queue_make_request(BLK_DEFAULT_QUEUE(MAJOR_NR), loop_make_request);
for (i = 0; i < max_loop; i++) {
-@@ -1036,18 +1210,28 @@
+@@ -1048,18 +1222,28 @@
memset(lo, 0, sizeof(struct loop_device));
init_MUTEX(&lo->lo_ctl_mutex);
init_MUTEX_LOCKED(&lo->lo_sem);
@@ -1401,7 +1400,7 @@
devfs_handle = devfs_mk_dir(NULL, "loop", NULL);
devfs_register_series(devfs_handle, "%u", max_loop, DEVFS_FL_DEFAULT,
MAJOR_NR, 0,
-@@ -1057,10 +1241,13 @@
+@@ -1069,10 +1253,13 @@
printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
return 0;
@@ -1415,7 +1414,7 @@
if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
printk(KERN_WARNING "loop: cannot unregister blkdev\n");
printk(KERN_ERR "loop: ran out of memory\n");
-@@ -1072,9 +1259,14 @@
+@@ -1084,9 +1271,14 @@
devfs_unregister(devfs_handle);
if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
printk(KERN_WARNING "loop: cannot unregister blkdev\n");
================================================================
Index: SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch
diff -u SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch:1.24 SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch:1.25
--- SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch:1.24 Thu Nov 17 11:41:03 2005
+++ SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch Thu Nov 23 10:22:59 2006
@@ -30,15 +30,7 @@
diff -urN linux-2.4.22.org/arch/sparc/kernel/sparc_ksyms.c linux-2.4.22/arch/sparc/kernel/sparc_ksyms.c
--- linux-2.4.22.org/arch/sparc/kernel/sparc_ksyms.c 2003-11-21 20:40:44.000000000 +0100
+++ linux-2.4.22/arch/sparc/kernel/sparc_ksyms.c 2003-11-21 20:41:45.000000000 +0100
-@@ -265,6 +265,7 @@
- EXPORT_SYMBOL(strpbrk);
- EXPORT_SYMBOL(strtok);
- EXPORT_SYMBOL(strstr);
-+EXPORT_SYMBOL(memchr);
- EXPORT_SYMBOL(page_kernel);
-
- /* Special internal versions of library functions. */
-@@ -282,6 +283,7 @@
+@@ -283,6 +283,7 @@
/* Moving data to/from userspace. */
EXPORT_SYMBOL(__copy_user);
EXPORT_SYMBOL(__strncpy_from_user);
@@ -65,15 +57,7 @@
extern void *__memscan_zero(void *, size_t);
extern void *__memscan_generic(void *, int, size_t);
extern int __memcmp(const void *, const void *, __kernel_size_t);
-@@ -305,6 +306,7 @@
- EXPORT_SYMBOL(strpbrk);
- EXPORT_SYMBOL(strtok);
- EXPORT_SYMBOL(strstr);
-+EXPORT_SYMBOL(memchr);
-
- #ifdef CONFIG_SOLARIS_EMUL_MODULE
- EXPORT_SYMBOL(linux_sparc_syscall);
-@@ -351,6 +353,8 @@
+@@ -352,6 +353,8 @@
EXPORT_SYMBOL(phys_base);
EXPORT_SYMBOL(sparc64_valid_addr_bitmap);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/patch-cryptoloop-jari-2.4.22-rc2.0?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/linux-2.4.20-EXPORT_SYMBOL.patch?r1=1.24&r2=1.25&f=u
More information about the pld-cvs-commit
mailing list