Author: arekm Date: Fri Dec 4 19:21:59 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- update patches for 2.6.32; they apply when using --without grsecurity
---- Files affected:
packages/kernel:
kernel-hostap.patch (1.2 -> 1.3) , kernel-imq.patch (1.4 -> 1.5) ,
kernel-owner-xid.patch (1.3 -> 1.4) , kernel-reiser4.patch (1.6 -> 1.7) ,
kernel-small_fixes.patch (1.6 -> 1.7) , kernel-tuxonice.patch (1.8 -> 1.9) ,
kernel-vserver-2.3.patch (1.25 -> 1.26) , kernel-warnings.patch (1.3 -> 1.4) ,
kernel-wrr.patch (1.6 -> 1.7) , kernel.spec (1.728 -> 1.729) ,
kernel-xfs-recover-quota.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-hostap.patch
diff -u packages/kernel/kernel-hostap.patch:1.2
packages/kernel/kernel-hostap.patch:1.3
--- packages/kernel/kernel-hostap.patch:1.2 Tue Mar 31 14:04:21 2009
+++ packages/kernel/kernel-hostap.patch Fri Dec 4 20:21:52 2009
@@ -19,17 +19,6 @@
iface->stats.tx_packets++;
iface->stats.tx_bytes += skb->len;
-@@ -404,8 +408,6 @@
- }
-
- if (skb->len < 24) {
-- printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
-- "(len=%d)\n", dev->name, skb->len);
- ret = 0;
- iface->stats.tx_dropped++;
- goto fail;
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_cs.c.orig
-Only in linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap: hostap_cs.c.rej
diff -ur linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c
linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c
--- linux-2.6.18-gentoo/drivers/net/wireless/hostap/hostap_hw.c
2006-09-21 01:26:27.000000000 -0400
+++ linux-2.6.18-gentoo-rawtx/drivers/net/wireless/hostap/hostap_hw.c
2006-09-21 01:30:18.000000000 -0400
================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.4
packages/kernel/kernel-imq.patch:1.5
--- packages/kernel/kernel-imq.patch:1.4 Thu Sep 10 12:46:58 2009
+++ packages/kernel/kernel-imq.patch Fri Dec 4 20:21:52 2009
@@ -822,7 +822,7 @@
@@ -332,6 +341,9 @@
__u8 requeue:1;
#endif
- /* 0/13/14 bit hole */
+ /* 0/14 bit hole */
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ __u8 imq_flags:IMQ_F_BITS;
+#endif
================================================================
Index: packages/kernel/kernel-owner-xid.patch
diff -u packages/kernel/kernel-owner-xid.patch:1.3
packages/kernel/kernel-owner-xid.patch:1.4
--- packages/kernel/kernel-owner-xid.patch:1.3 Mon Jul 20 14:57:26 2009
+++ packages/kernel/kernel-owner-xid.patch Fri Dec 4 20:21:52 2009
@@ -18,101 +18,9 @@
};
#endif /* _XT_OWNER_MATCH_H */
-Only in linux-2.6.25-owner-xid/include/linux/netfilter: xt_owner.h~
-diff -upr linux-2.6.25/include/linux/netfilter_ipv4/ipt_owner.h
linux-2.6.25-owner-xid/include/linux/netfilter_ipv4/ipt_owner.h
---- linux-2.6.25/include/linux/netfilter_ipv4/ipt_owner.h 2008-05-20
17:15:02.411418369 +0000
-+++ linux-2.6.25-owner-xid/include/linux/netfilter_ipv4/ipt_owner.h
2008-05-20 17:16:22.905886167 +0000
-@@ -1,12 +1,16 @@
- #ifndef _IPT_OWNER_H
- #define _IPT_OWNER_H
-
-+#include <linux/types.h>
-+
- /* match and invert flags */
- #define IPT_OWNER_UID 0x01
- #define IPT_OWNER_GID 0x02
- #define IPT_OWNER_PID 0x04
- #define IPT_OWNER_SID 0x08
- #define IPT_OWNER_COMM 0x10
-+#define IPT_OWNER_NID 0x20
-+#define IPT_OWNER_XID 0x40
-
- struct ipt_owner_info {
- uid_t uid;
-@@ -15,6 +19,8 @@ struct ipt_owner_info {
- pid_t sid;
- char comm[16];
- u_int8_t match, invert; /* flags */
-+ u_int32_t nid;
-+ u_int32_t xid;
- };
-
- #endif /*_IPT_OWNER_H*/
-diff -upr linux-2.6.25/include/linux/netfilter_ipv6/ip6t_owner.h
linux-2.6.25-owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h
---- linux-2.6.25/include/linux/netfilter_ipv6/ip6t_owner.h 2008-05-20
17:15:02.411418369 +0000
-+++ linux-2.6.25-owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h
2008-05-20 17:16:22.905886167 +0000
-@@ -1,11 +1,15 @@
- #ifndef _IP6T_OWNER_H
- #define _IP6T_OWNER_H
-
-+#include <linux/types.h>
-+
- /* match and invert flags */
- #define IP6T_OWNER_UID 0x01
- #define IP6T_OWNER_GID 0x02
- #define IP6T_OWNER_PID 0x04
- #define IP6T_OWNER_SID 0x08
-+#define IP6T_OWNER_NID 0x20
-+#define IP6T_OWNER_XID 0x40
-
- struct ip6t_owner_info {
- uid_t uid;
-@@ -13,6 +17,8 @@ struct ip6t_owner_info {
- pid_t pid;
- pid_t sid;
- u_int8_t match, invert; /* flags */
-+ u_int32_t nid;
-+ u_int32_t xid;
- };
-
- #endif /*_IPT_OWNER_H*/
diff -upr linux-2.6.25/net/netfilter/xt_owner.c
linux-2.6.25-owner-xid/net/netfilter/xt_owner.c
--- linux-2.6.25/net/netfilter/xt_owner.c 2008-05-20 17:15:02.411418369
+0000
+++ linux-2.6.25-owner-xid/net/netfilter/xt_owner.c 2008-05-20
17:48:15.774419069 +0000
-@@ -46,6 +46,16 @@ owner_mt_v0(const struct sk_buff *skb, c
- !!(info->invert & IPT_OWNER_GID))
- return false;
-
-+ if (info->match & IPT_OWNER_NID)
-+ if ((skb->sk->sk_nid != info->nid) ^
-+ !!(info->invert & IPT_OWNER_NID))
-+ return 0;
-+
-+ if (info->match & IPT_OWNER_XID)
-+ if ((skb->sk->sk_xid != info->xid) ^
-+ !!(info->invert & IPT_OWNER_XID))
-+ return 0;
-+
- return true;
- }
-
-@@ -75,6 +85,16 @@ owner_mt6_v0(const struct sk_buff *skb,
- !!(info->invert & IP6T_OWNER_GID))
- return false;
-
-+ if (info->match & IP6T_OWNER_NID)
-+ if ((skb->sk->sk_nid != info->nid) ^
-+ !!(info->invert & IP6T_OWNER_NID))
-+ return 0;
-+
-+ if (info->match & IP6T_OWNER_XID)
-+ if ((skb->sk->sk_xid != info->xid) ^
-+ !!(info->invert & IP6T_OWNER_XID))
-+ return 0;
-+
- return true;
- }
-
@@ -113,6 +133,16 @@ owner_mt(const struct sk_buff *skb, cons
!(info->invert & XT_OWNER_GID))
return false;
@@ -130,4 +38,3 @@
return true;
}
-Only in linux-2.6.25-owner-xid/net/netfilter: xt_owner.c~
================================================================
Index: packages/kernel/kernel-reiser4.patch
diff -u packages/kernel/kernel-reiser4.patch:1.6
packages/kernel/kernel-reiser4.patch:1.7
--- packages/kernel/kernel-reiser4.patch:1.6 Tue Jul 21 01:10:51 2009
+++ packages/kernel/kernel-reiser4.patch Fri Dec 4 20:21:52 2009
@@ -113,21 +113,6 @@
+dont_load_bitmap
+ Don't load all bitmap blocks at mount time, it is useful for
+ machines with tiny RAM and large disks.
-diff -urN linux-2.6.28.orig/fs/fs-writeback.c linux-2.6.28/fs/fs-writeback.c
---- linux-2.6.28.orig/fs/fs-writeback.c 2008-12-26 14:35:40.000000000
+0300
-+++ linux-2.6.28/fs/fs-writeback.c 2008-12-26 15:03:53.000000000 +0300
-@@ -531,7 +531,10 @@
- static void sync_sb_inodes(struct super_block *sb,
- struct writeback_control *wbc)
- {
-- generic_sync_sb_inodes(sb, wbc);
-+ if (sb->s_op->sync_inodes)
-+ sb->s_op->sync_inodes(sb, wbc);
-+ else
-+ generic_sync_sb_inodes(sb, wbc);
- }
-
- /*
diff -urN linux-2.6.28.orig/fs/Kconfig linux-2.6.28/fs/Kconfig
--- linux-2.6.28.orig/fs/Kconfig 2008-12-26 14:35:40.000000000 +0300
+++ linux-2.6.28/fs/Kconfig 2008-12-26 15:03:53.000000000 +0300
================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.6
packages/kernel/kernel-small_fixes.patch:1.7
--- packages/kernel/kernel-small_fixes.patch:1.6 Wed Sep 16 00:20:46 2009
+++ packages/kernel/kernel-small_fixes.patch Fri Dec 4 20:21:52 2009
@@ -26,70 +26,6 @@
/* Enforce in-order execution of data I/O.
* No distinction between read/write on PPC; use eieio for all three.
*/
---- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig 2007-02-04
19:44:54.000000000 +0100
-+++ linux-2.6.20/drivers/media/common/ir-keymaps.c 2007-02-17
22:22:39.327414970 +0100
-@@ -151,10 +151,6 @@
-
- IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
-
-- [ 0x1e ] = KEY_POWER, // power
-- [ 0x07 ] = KEY_MEDIA, // source
-- [ 0x1c ] = KEY_SEARCH, // scan
--
- /* FIXME: duplicate keycodes?
- *
- * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
-@@ -175,14 +171,10 @@
- */
-
- [ 0x03 ] = KEY_TUNER, // TV/FM
-+ [ 0x07 ] = KEY_SEARCH, // scan
-+ [ 0x1c ] = KEY_ZOOM, // zoom
-
-- [ 0x00 ] = KEY_RECORD,
-- [ 0x08 ] = KEY_STOP,
-- [ 0x11 ] = KEY_PLAY,
--
-- [ 0x1a ] = KEY_PLAYPAUSE, // freeze
-- [ 0x19 ] = KEY_ZOOM, // zoom
-- [ 0x0f ] = KEY_TEXT, // min
-+ [ 0x1e ] = KEY_POWER, // power
-
- [ 0x01 ] = KEY_1,
- [ 0x0b ] = KEY_2,
-@@ -195,20 +187,22 @@
- [ 0x12 ] = KEY_9,
- [ 0x02 ] = KEY_0,
- [ 0x10 ] = KEY_LAST, // +100
-- [ 0x13 ] = KEY_LIST, // recall
-+ [ 0x13 ] = KEY_LIST, // loop
-
-- [ 0x1f ] = KEY_CHANNELUP, // chn down
-- [ 0x17 ] = KEY_CHANNELDOWN, // chn up
-- [ 0x16 ] = KEY_VOLUMEUP, // vol down
-- [ 0x14 ] = KEY_VOLUMEDOWN, // vol up
-+ [ 0x1f ] = KEY_VOLUMEUP, // vol down
-+ [ 0x17 ] = KEY_VOLUMEDOWN, // vol up
-+ [ 0x16 ] = KEY_CHANNELUP, // chn down
-+ [ 0x14 ] = KEY_CHANNELDOWN, // chn up
-
-- [ 0x04 ] = KEY_KPMINUS, // <<<
-+ [ 0x00 ] = KEY_MEDIA, // source
-+ [ 0x18 ] = KEY_MUTE, // mute/unmute
-+
-+ [ 0x04 ] = KEY_KPMINUS, // -
- [ 0x0e ] = KEY_SETUP, // function
-- [ 0x0c ] = KEY_KPPLUS, // >>>
-+ [ 0x0c ] = KEY_KPPLUS, // +
-
-- [ 0x0d ] = KEY_GOTO, // mts
-- [ 0x1d ] = KEY_REFRESH, // reset
-- [ 0x18 ] = KEY_MUTE // mute/unmute
-+ [ 0x0d ] = KEY_REFRESH, // reset
-+ [ 0x0f ] = KEY_PLAYPAUSE // freeze
- };
-
- EXPORT_SYMBOL_GPL(ir_codes_pixelview);
--- linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-07-09
01:32:17.000000000 +0200
+++ linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-08-28
23:26:16.629658848 +0200
@@ -6,4 +6,7 @@
@@ -118,14 +54,4 @@
void restore_processor_state(void)
{
---- linux-2.6.31/scripts/Makefile.lib~ 2009-09-15 23:40:30.552124999 +0200
-+++ linux-2.6.31/scripts/Makefile.lib 2009-09-15 23:46:05.155641644 +0200
-@@ -208,7 +208,7 @@
-
- # Bzip2 and LZMA do not include size in file... so we have to fake that;
- # append the size as a 32-bit littleendian number as gzip does.
--size_append = echo -ne $(shell
\
-+size_append = /bin/echo -ne $(shell
\
- dec_size=0; \
- for F in $1; do
\
- fsize=$$(stat -c "%s" $$F); \
+
================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.8
packages/kernel/kernel-tuxonice.patch:1.9
--- packages/kernel/kernel-tuxonice.patch:1.8 Tue Oct 13 15:55:09 2009
+++ packages/kernel/kernel-tuxonice.patch Fri Dec 4 20:21:52 2009
@@ -1436,10 +1436,10 @@
+ testing. His efforts have contributed as much to TuxOnIce as any of the
+ names above.
diff --git a/MAINTAINERS b/MAINTAINERS
-index 8dca9d8..14c7e10 100644
+index 4f96ac8..21b92f2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5038,6 +5038,13 @@ S: Maintained
+@@ -5259,6 +5259,13 @@ S: Maintained
F: drivers/tc/
F: include/linux/tc.h
@@ -1454,7 +1454,7 @@
M: Dario Ballabio <[email protected]>
L: [email protected]
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
-index 5422169..33be4fa 100644
+index cb96cb2..2be8da2 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -396,6 +396,7 @@ void kernel_map_pages(struct page *page, int numpages, int
enable)
@@ -1466,10 +1466,10 @@
static int fixmaps;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index a06e8d1..9a1fe4b 100644
+index f930787..869133f 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -677,6 +677,7 @@ void machine_restart(char *cmd)
+@@ -693,6 +693,7 @@ void machine_restart(char *cmd)
{
machine_ops.restart(cmd);
}
@@ -1478,10 +1478,10 @@
void machine_halt(void)
{
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index 7e600c1..418725a 100644
+index dd38bfb..26b3bbf 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
-@@ -1284,6 +1284,7 @@ void kernel_map_pages(struct page *page, int numpages,
int enable)
+@@ -1274,6 +1274,7 @@ void kernel_map_pages(struct page *page, int numpages,
int enable)
*/
__flush_tlb_all();
}
@@ -1489,7 +1489,7 @@
#ifdef CONFIG_HIBERNATION
-@@ -1298,7 +1299,7 @@ bool kernel_page_present(struct page *page)
+@@ -1288,7 +1289,7 @@ bool kernel_page_present(struct page *page)
pte = lookup_address((unsigned long)page_address(page), &level);
return (pte_val(*pte) & _PAGE_PRESENT);
}
@@ -1499,7 +1499,7 @@
#endif /* CONFIG_DEBUG_PAGEALLOC */
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index b3d20b9..cb13f39 100644
+index 8aa85f1..b22c157 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -111,9 +111,7 @@ void save_processor_state(void)
@@ -1557,28 +1557,481 @@
return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;
}
+EXPORT_SYMBOL_GPL(arch_hibernation_header_restore);
+diff --git a/block/Makefile b/block/Makefile
+index ba74ca6..aa30a88 100644
+--- a/block/Makefile
++++ b/block/Makefile
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
+ blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \
+ blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
+- blk-iopoll.o ioctl.o genhd.o scsi_ioctl.o
++ blk-iopoll.o ioctl.o genhd.o scsi_ioctl.o uuid.o
+
+ obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
+ obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
+diff --git a/block/blk-core.c b/block/blk-core.c
+index 71da511..e338e9d 100644
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -37,6 +37,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap);
+ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);
+ EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);
+
++int trap_non_toi_io;
++EXPORT_SYMBOL_GPL(trap_non_toi_io);
++
+ static int __make_request(struct request_queue *q, struct bio *bio);
+
+ /*
+@@ -1555,6 +1558,9 @@ void submit_bio(int rw, struct bio *bio)
+
+ bio->bi_rw |= rw;
+
++ if (unlikely(trap_non_toi_io))
++ BUG_ON(!bio_rw_flagged(bio, BIO_RW_TUXONICE));
++
+ /*
+ * If it's a regular read/write or a barrier with data attached,
+ * go through the normal accounting stuff before submission.
+diff --git a/block/genhd.c b/block/genhd.c
+index 517e433..9a5fa6f 100644
+--- a/block/genhd.c
++++ b/block/genhd.c
+@@ -18,6 +18,8 @@
+ #include <linux/buffer_head.h>
+ #include <linux/mutex.h>
+ #include <linux/idr.h>
++#include <linux/ctype.h>
++#include <linux/uuid.h>
+
+ #include "blk.h"
+
+@@ -1274,3 +1276,30 @@ int invalidate_partition(struct gendisk *disk, int
partno)
+ }
+
+ EXPORT_SYMBOL(invalidate_partition);
++
++dev_t blk_lookup_uuid(const char *uuid)
++{
++ dev_t devt = MKDEV(0, 0);
++ struct class_dev_iter iter;
++ struct device *dev;
++
++ class_dev_iter_init(&iter, &block_class, NULL, &disk_type);
++ while (!devt && (dev = class_dev_iter_next(&iter))) {
++ struct gendisk *disk = dev_to_disk(dev);
++ struct disk_part_iter piter;
++ struct hd_struct *part;
++
++ disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
++
++ while ((part = disk_part_iter_next(&piter))) {
++ if (part_matches_uuid(part, uuid)) {
++ devt = part_devt(part);
++ break;
++ }
++ }
++ disk_part_iter_exit(&piter);
++ }
++ class_dev_iter_exit(&iter);
++ return devt;
++}
++EXPORT_SYMBOL_GPL(blk_lookup_uuid);
+diff --git a/block/uuid.c b/block/uuid.c
+new file mode 100644
+index 0000000..fefc3ed
+--- /dev/null
++++ b/block/uuid.c
+@@ -0,0 +1,366 @@
++#include <linux/blkdev.h>
++#include <linux/ctype.h>
++
++#if 0
++#define PRINTK(fmt, args...) printk(KERN_DEBUG fmt, ## args)
++#define PRINT_HEX_DUMP(v1, v2, v3, v4, v5, v6, v7, v8) \
++ print_hex_dump(v1, v2, v3, v4, v5, v6, v7, v8)
++#else
++#define PRINTK(fmt, args...)
++#define PRINT_HEX_DUMP(v1, v2, v3, v4, v5, v6, v7, v8)
++#endif
++
++/*
++ * Simple UUID translation
++ */
++
++struct uuid_info {
++ const char *name;
++ long bkoff;
++ unsigned sboff;
++ unsigned sig_len;
++ const char *magic;
++ int uuid_offset;
++};
++
++/*
++ * Based on libuuid's blkid_magic array. Note that I don't
++ * have uuid offsets for all of these yet - mssing ones are 0x0.
++ * Further information welcome.
++ *
++ * Rearranged by sector of fs signature for optimisation.
++ */
++static struct uuid_info uuid_list[] = {
++ { "oracleasm", 0, 32, 8, "ORCLDISK", 0x0 },
++ { "ntfs", 0, 3, 8, "NTFS ", 0x0 },
++ { "vfat", 0, 0x52, 5, "MSWIN", 0x0 },
++ { "vfat", 0, 0x52, 8, "FAT32 ", 0x0 },
++ { "vfat", 0, 0x36, 5, "MSDOS", 0x0 },
++ { "vfat", 0, 0x36, 8, "FAT16 ", 0x0 },
++ { "vfat", 0, 0x36, 8, "FAT12 ", 0x0 },
++ { "vfat", 0, 0, 1, "\353", 0x0 },
++ { "vfat", 0, 0, 1, "\351", 0x0 },
++ { "vfat", 0, 0x1fe, 2, "\125\252", 0x0 },
++ { "xfs", 0, 0, 4, "XFSB", 0x14 },
++ { "romfs", 0, 0, 8, "-rom1fs-", 0x0 },
++ { "bfs", 0, 0, 4, "\316\372\173\033", 0 },
++ { "cramfs", 0, 0, 4, "E=\315\050", 0x0 },
++ { "qnx4", 0, 4, 6, "QNX4FS", 0 },
++ { "crypt_LUKS", 0, 0, 6, "LUKS\xba\xbe", 0x0 },
++ { "squashfs", 0, 0, 4, "sqsh", 0 },
++ { "squashfs", 0, 0, 4, "hsqs", 0 },
++ { "ocfs", 0, 8, 9, "OracleCFS", 0x0 },
++ { "lvm2pv", 0, 0x018, 8, "LVM2 001", 0x0 },
++ { "sysv", 0, 0x3f8, 4, "\020~\030\375", 0 },
++ { "jbd", 1, 0x38, 2, "\123\357", 0x0 },
++ { "ext4dev", 1, 0x38, 2, "\123\357", 0x468 },
++ { "ext4", 1, 0x38, 2, "\123\357", 0x468 },
++ { "ext3", 1, 0x38, 2, "\123\357", 0x468 },
++ { "ext2", 1, 0x38, 2, "\123\357", 0x468 },
++ { "minix", 1, 0x10, 2, "\177\023", 0 },
++ { "minix", 1, 0x10, 2, "\217\023", 0 },
++ { "minix", 1, 0x10, 2, "\150\044", 0 },
++ { "minix", 1, 0x10, 2, "\170\044", 0 },
++ { "lvm2pv", 1, 0x018, 8, "LVM2 001", 0x0 },
++ { "vxfs", 1, 0, 4, "\365\374\001\245", 0 },
++ { "hfsplus", 1, 0, 2, "BD", 0x0 },
++ { "hfsplus", 1, 0, 2, "H+", 0x0 },
++ { "hfsplus", 1, 0, 2, "HX", 0x0 },
++ { "hfs", 1, 0, 2, "BD", 0x0 },
++ { "ocfs2", 1, 0, 6, "OCFSV2", 0x0 },
++ { "lvm2pv", 0, 0x218, 8, "LVM2 001", 0x0 },
++ { "lvm2pv", 1, 0x218, 8, "LVM2 001", 0x0 },
++ { "ocfs2", 2, 0, 6, "OCFSV2", 0x0 },
++ { "swap", 0, 0xff6, 10, "SWAP-SPACE", 0x40c },
++ { "swap", 0, 0xff6, 10, "SWAPSPACE2", 0x40c },
++ { "swsuspend", 0, 0xff6, 9, "S1SUSPEND", 0x40c },
++ { "swsuspend", 0, 0xff6, 9, "S2SUSPEND", 0x40c },
++ { "swsuspend", 0, 0xff6, 9, "ULSUSPEND", 0x40c },
++ { "ocfs2", 4, 0, 6, "OCFSV2", 0x0 },
++ { "ocfs2", 8, 0, 6, "OCFSV2", 0x0 },
++ { "hpfs", 8, 0, 4, "I\350\225\371", 0 },
++ { "reiserfs", 8, 0x34, 8, "ReIsErFs", 0x10054 },
++ { "reiserfs", 8, 20, 8, "ReIsErFs", 0x10054 },
++ { "zfs", 8, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", 0x0 },
++ { "zfs", 8, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", 0x0 },
++ { "ufs", 8, 0x55c, 4, "T\031\001\000", 0 },
++ { "swap", 0, 0x1ff6, 10, "SWAP-SPACE", 0x40c },
++ { "swap", 0, 0x1ff6, 10, "SWAPSPACE2", 0x40c },
++ { "swsuspend", 0, 0x1ff6, 9, "S1SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x1ff6, 9, "S2SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x1ff6, 9, "ULSUSPEND", 0x40c },
++ { "reiserfs", 64, 0x34, 9, "ReIsEr2Fs", 0x10054 },
++ { "reiserfs", 64, 0x34, 9, "ReIsEr3Fs", 0x10054 },
++ { "reiserfs", 64, 0x34, 8, "ReIsErFs", 0x10054 },
++ { "reiser4", 64, 0, 7, "ReIsEr4", 0x100544 },
++ { "gfs2", 64, 0, 4, "\x01\x16\x19\x70", 0x0 },
++ { "gfs", 64, 0, 4, "\x01\x16\x19\x70", 0x0 },
++ { "btrfs", 64, 0x40, 8, "_BHRfS_M", 0x0 },
++ { "swap", 0, 0x3ff6, 10, "SWAP-SPACE", 0x40c },
++ { "swap", 0, 0x3ff6, 10, "SWAPSPACE2", 0x40c },
++ { "swsuspend", 0, 0x3ff6, 9, "S1SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x3ff6, 9, "S2SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x3ff6, 9, "ULSUSPEND", 0x40c },
++ { "udf", 32, 1, 5, "BEA01", 0x0 },
++ { "udf", 32, 1, 5, "BOOT2", 0x0 },
++ { "udf", 32, 1, 5, "CD001", 0x0 },
++ { "udf", 32, 1, 5, "CDW02", 0x0 },
++ { "udf", 32, 1, 5, "NSR02", 0x0 },
++ { "udf", 32, 1, 5, "NSR03", 0x0 },
++ { "udf", 32, 1, 5, "TEA01", 0x0 },
++ { "iso9660", 32, 1, 5, "CD001", 0x0 },
++ { "iso9660", 32, 9, 5, "CDROM", 0x0 },
++ { "jfs", 32, 0, 4, "JFS1", 0x88 },
++ { "swap", 0, 0x7ff6, 10, "SWAP-SPACE", 0x40c },
++ { "swap", 0, 0x7ff6, 10, "SWAPSPACE2", 0x40c },
++ { "swsuspend", 0, 0x7ff6, 9, "S1SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x7ff6, 9, "S2SUSPEND", 0x40c },
++ { "swsuspend", 0, 0x7ff6, 9, "ULSUSPEND", 0x40c },
++ { "swap", 0, 0xfff6, 10, "SWAP-SPACE", 0x40c },
++ { "swap", 0, 0xfff6, 10, "SWAPSPACE2", 0x40c },
++ { "swsuspend", 0, 0xfff6, 9, "S1SUSPEND", 0x40c },
++ { "swsuspend", 0, 0xfff6, 9, "S2SUSPEND", 0x40c },
++ { "swsuspend", 0, 0xfff6, 9, "ULSUSPEND", 0x40c },
++ { "zfs", 264, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", 0x0 },
++ { "zfs", 264, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", 0x0 },
++ { NULL, 0, 0, 0, NULL, 0x0 }
++};
++
++static void uuid_end_bio(struct bio *bio, int err)
++{
++ struct page *page = bio->bi_io_vec[0].bv_page;
++
++ BUG_ON(!test_bit(BIO_UPTODATE, &bio->bi_flags));
++
++ unlock_page(page);
++ bio_put(bio);
++}
++
++
++/**
++ * submit - submit BIO request
++ * @writing: READ or WRITE.
++ * @dev: The block device we're using.
++ * @first_block: The first sector we're using.
++ * @page: The page being used for I/O.
++ * @free_group: If writing, the group that was used in allocating the page
++ * and which will be used in freeing the page from the completion
++ * routine.
++ *
++ * Based on Patrick Mochell's pmdisk code from long ago: "Straight from the
++ * textbook - allocate and initialize the bio. If we're writing, make sure
++ * the page is marked as dirty. Then submit it and carry on."
++ *
++ * If we're just testing the speed of our own code, we fake having done all
++ * the hard work and all toi_end_bio immediately.
++ **/
++static struct page *read_bdev_sector(struct block_device *dev,
++ sector_t first_block)
++{
++ struct bio *bio = NULL;
++ struct page *page = alloc_page(GFP_KERNEL);
++
++ if (!page)
++ return NULL;
++
++ lock_page(page);
++
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-hostap.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-owner-xid.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-reiser4.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-warnings.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-wrr.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.728&r2=1.729&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
