/[linux-patches]/genpatches-2.6/trunk/2.6.19/4105_dm-bbr.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.19/4105_dm-bbr.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 273 Revision 274
1diff -urNpX dontdiff linux-2.6.12-rc2-gentoo/drivers/md/dm-bbr.c linux-dsd/drivers/md/dm-bbr.c 1Index: linux-git/drivers/md/dm-bbr.c
2--- linux-2.6.12-rc2-gentoo/drivers/md/dm-bbr.c 1970-01-01 01:00:00.000000000 +0100 2===================================================================
3+++ linux-dsd/drivers/md/dm-bbr.c 2005-04-06 10:06:16.000000000 +0100 3--- /dev/null
4+++ linux-git/drivers/md/dm-bbr.c
4@@ -0,0 +1,1003 @@ 5@@ -0,0 +1,1003 @@
5+/* 6+/*
6+ * (C) Copyright IBM Corp. 2002, 2004 7+ * (C) Copyright IBM Corp. 2002, 2004
7+ * 8+ *
8+ * This program is free software; you can redistribute it and/or modify 9+ * This program is free software; you can redistribute it and/or modify
652+ return rc; 653+ return rc;
653+ } 654+ }
654+ } 655+ }
655+ offset += (lsn << SECTOR_SHIFT); 656+ offset += (lsn << SECTOR_SHIFT);
656+ } 657+ }
657+ 658+
658+ /* Process the remapped sector. */ 659+ /* Process the remapped sector. */
659+ job.sector = remapped_lsn; 660+ job.sector = remapped_lsn;
660+ job.count = 1; 661+ job.count = 1;
661+ rc = dm_io_sync(1, &job, rw, &pl, offset, &error); 662+ rc = dm_io_sync(1, &job, rw, &pl, offset, &error);
662+ if (rc) { 663+ if (rc) {
1003+} 1004+}
1004+ 1005+
1005+module_init(dm_bbr_init); 1006+module_init(dm_bbr_init);
1006+module_exit(dm_bbr_exit); 1007+module_exit(dm_bbr_exit);
1007+MODULE_LICENSE("GPL"); 1008+MODULE_LICENSE("GPL");
1008diff -urNpX dontdiff linux-2.6.12-rc2-gentoo/drivers/md/dm-bbr.h linux-dsd/drivers/md/dm-bbr.h 1009Index: linux-git/drivers/md/dm-bbr.h
1009--- linux-2.6.12-rc2-gentoo/drivers/md/dm-bbr.h 1970-01-01 01:00:00.000000000 +0100 1010===================================================================
1010+++ linux-dsd/drivers/md/dm-bbr.h 2005-04-06 10:06:16.000000000 +0100 1011--- /dev/null
1012+++ linux-git/drivers/md/dm-bbr.h
1011@@ -0,0 +1,125 @@ 1013@@ -0,0 +1,125 @@
1012+/* 1014+/*
1013+ * (C) Copyright IBM Corp. 2002, 2004 1015+ * (C) Copyright IBM Corp. 2002, 2004
1014+ * 1016+ *
1015+ * This program is free software; you can redistribute it and/or modify 1017+ * This program is free software; you can redistribute it and/or modify
1132+ u64 nr_replacement_blks; 1134+ u64 nr_replacement_blks;
1133+ u32 blksize_in_sects; 1135+ u32 blksize_in_sects;
1134+ atomic_t in_use_replacement_blks; 1136+ atomic_t in_use_replacement_blks;
1135+}; 1137+};
1136+ 1138+
1137diff -urNpX dontdiff linux-2.6.12-rc2-gentoo/drivers/md/Kconfig linux-dsd/drivers/md/Kconfig 1139Index: linux-git/drivers/md/Kconfig
1138--- linux-2.6.12-rc2-gentoo/drivers/md/Kconfig 2005-04-06 09:46:58.000000000 +0100 1140===================================================================
1139+++ linux-dsd/drivers/md/Kconfig 2005-04-06 10:07:02.000000000 +0100 1141--- linux-git.orig/drivers/md/Kconfig
1142+++ linux-git/drivers/md/Kconfig
1140@@ -236,5 +236,16 @@ config DM_MULTIPATH_EMC 1143@@ -236,5 +236,16 @@ config DM_MULTIPATH_EMC
1141 ---help--- 1144 ---help---
1142 Multipath support for EMC CX/AX series hardware. 1145 Multipath support for EMC CX/AX series hardware.
1143 1146
1144+config BLK_DEV_DM_BBR 1147+config BLK_DEV_DM_BBR
1152+ 1155+
1153+ If unsure, say N. 1156+ If unsure, say N.
1154+ 1157+
1155 endmenu 1158 endmenu
1156 1159
1157diff -urNpX dontdiff linux-2.6.12-rc2-gentoo/drivers/md/Makefile linux-dsd/drivers/md/Makefile 1160Index: linux-git/drivers/md/Makefile
1158--- linux-2.6.12-rc2-gentoo/drivers/md/Makefile 2005-04-06 09:46:58.000000000 +0100 1161===================================================================
1159+++ linux-dsd/drivers/md/Makefile 2005-04-06 10:06:16.000000000 +0100 1162--- linux-git.orig/drivers/md/Makefile
1163+++ linux-git/drivers/md/Makefile
1160@@ -36,6 +36,7 @@ obj-$(CONFIG_DM_MULTIPATH_EMC) += dm-emc 1164@@ -37,6 +37,7 @@ obj-$(CONFIG_DM_MULTIPATH_EMC) += dm-emc
1161 obj-$(CONFIG_DM_SNAPSHOT) += dm-snapshot.o 1165 obj-$(CONFIG_DM_SNAPSHOT) += dm-snapshot.o
1162 obj-$(CONFIG_DM_MIRROR) += dm-mirror.o 1166 obj-$(CONFIG_DM_MIRROR) += dm-mirror.o
1163 obj-$(CONFIG_DM_ZERO) += dm-zero.o 1167 obj-$(CONFIG_DM_ZERO) += dm-zero.o
1164+obj-$(CONFIG_BLK_DEV_DM_BBR) += dm-bbr.o 1168+obj-$(CONFIG_BLK_DEV_DM_BBR) += dm-bbr.o
1165 1169

Legend:
Removed from v.273  
changed lines
  Added in v.274

  ViewVC Help
Powered by ViewVC 1.1.20