From dc6f3f276e2b4cbc1563def8fb39373a45db84ac Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:44:08 +0100 Subject: [PATCH 01/13] mm/slab.c: fix a comment typo --- mm/slab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slab.c b/mm/slab.c index e291f5e1afb..8a73dcfc6a2 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -434,7 +434,7 @@ struct kmem_cache { /* Optimization question: fewer reaps means less * probability for unnessary cpucache drain/refill cycles. * - * OTHO the cpuarrays can contain lots of objects, + * OTOH the cpuarrays can contain lots of objects, * which could lock up otherwise freeable slabs. */ #define REAPTIMEOUT_CPUC (2*HZ) From 000404fafcafb4fa4eee23822b21afc08bd4dd39 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:46:12 +0100 Subject: [PATCH 02/13] MAINTAINERS: PKTCDVD DRIVER: remove entry for a subscribers-only list This patch was already ACK'ed by Peter Osterlund. --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 995bfd8e6e7..3028d4b98af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1970,7 +1970,6 @@ PKTCDVD DRIVER P: Peter Osterlund M: petero2@telia.com L: linux-kernel@vger.kernel.org -L: packet-writing@suse.com S: Maintained POSIX CLOCKS and TIMERS From 6e1e8e11c78859ea71e3de4c60d86a01d26c26e0 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:47:45 +0100 Subject: [PATCH 03/13] fs/freevxfs/: add #include's Every file should #include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/freevxfs/vxfs_bmap.c | 1 + fs/freevxfs/vxfs_olt.c | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/freevxfs/vxfs_bmap.c b/fs/freevxfs/vxfs_bmap.c index d3f6b2835bc..2d71128bd8d 100644 --- a/fs/freevxfs/vxfs_bmap.c +++ b/fs/freevxfs/vxfs_bmap.c @@ -36,6 +36,7 @@ #include "vxfs.h" #include "vxfs_inode.h" +#include "vxfs_extern.h" #ifdef DIAGNOSTIC diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c index 133476201d8..76a0708ae97 100644 --- a/fs/freevxfs/vxfs_olt.c +++ b/fs/freevxfs/vxfs_olt.c @@ -36,6 +36,7 @@ #include "vxfs.h" #include "vxfs_olt.h" +#include "vxfs_extern.h" static inline void From 34c90b29fe1b0814f26316782b4f0c0a115444df Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:48:36 +0100 Subject: [PATCH 04/13] jffs_fm.c should #include "intrep.h" Every file should #include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/jffs/jffs_fm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/jffs/jffs_fm.c b/fs/jffs/jffs_fm.c index 053e3a98a27..6da13b309bd 100644 --- a/fs/jffs/jffs_fm.c +++ b/fs/jffs/jffs_fm.c @@ -20,6 +20,7 @@ #include #include #include "jffs_fm.h" +#include "intrep.h" #if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset); From a70cf17c23e9967ca2e1ad19ab4ff59850ec936c Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:49:14 +0100 Subject: [PATCH 05/13] fs/partitions/ultrix.c should #include "ultrix.h" Every file should #include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/partitions/ultrix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/partitions/ultrix.c b/fs/partitions/ultrix.c index 8a8d4d9db31..ec852c11dce 100644 --- a/fs/partitions/ultrix.c +++ b/fs/partitions/ultrix.c @@ -7,6 +7,7 @@ */ #include "check.h" +#include "ultrix.h" int ultrix_partition(struct parsed_partitions *state, struct block_device *bdev) { From 0fb2dae0a9d77d360ef09ccbcf1b45aa6384bd41 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:49:52 +0100 Subject: [PATCH 06/13] fs/reiserfs/hashes.c should #include Every file should #include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/reiserfs/hashes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/reiserfs/hashes.c b/fs/reiserfs/hashes.c index 37c1306eb9b..a3ec238fd9e 100644 --- a/fs/reiserfs/hashes.c +++ b/fs/reiserfs/hashes.c @@ -19,6 +19,7 @@ // #include +#include #include #include From 848d5382496f670061eaf59844e039e22daba16f Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:50:38 +0100 Subject: [PATCH 07/13] drivers/char/ftape/lowlevel/ftape-buffer.c should #include "../lowlevel/ftape-buffer.h" Every file should #include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- drivers/char/ftape/lowlevel/ftape-buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/char/ftape/lowlevel/ftape-buffer.c b/drivers/char/ftape/lowlevel/ftape-buffer.c index 54af20cd9a2..c706ff16277 100644 --- a/drivers/char/ftape/lowlevel/ftape-buffer.c +++ b/drivers/char/ftape/lowlevel/ftape-buffer.c @@ -33,6 +33,7 @@ #include "../lowlevel/ftape-rw.h" #include "../lowlevel/ftape-read.h" #include "../lowlevel/ftape-tracing.h" +#include "../lowlevel/ftape-buffer.h" /* DMA'able memory allocation stuff. */ From b88b09851f4553c13c532af2f822b517a40f2ed5 Mon Sep 17 00:00:00 2001 From: James Nelson Date: Tue, 8 Nov 2005 16:52:12 +0100 Subject: [PATCH 08/13] floppy: relocate devfs comment Signed-off-by: James Nelson Signed-off-by: Domen Puncer Signed-off-by: Adrian Bunk --- drivers/block/floppy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 5eadbb9d4d7..77cfd6916ff 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -97,6 +97,10 @@ * features to asm/floppy.h. */ +/* + * 1998/1/21 -- Richard Gooch -- devfs support + */ + /* * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting & @@ -158,10 +162,6 @@ static int print_unex = 1; #define FDPATCHES #include -/* - * 1998/1/21 -- Richard Gooch -- devfs support - */ - #include #include From 1b33724a442b5e390ddc7507df3aeeb914915571 Mon Sep 17 00:00:00 2001 From: Will Dyson Date: Tue, 8 Nov 2005 16:54:53 +0100 Subject: [PATCH 09/13] remove unused fs/befs/attribute.c If anyone needs a fully-functional befs driver, the easiest route to that would probably be getting Haiku's befs driver to compile in userland as a FUSE fs. At any rate, attribute.c can go. It is easy enough to add back in if anyone ever wants to do the (relativly minor) refactoring nessisary to get it working. Signed-off-by: Will Dyson Signed-off-by: Adrian Bunk --- fs/befs/attribute.c | 117 -------------------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 fs/befs/attribute.c diff --git a/fs/befs/attribute.c b/fs/befs/attribute.c deleted file mode 100644 index e329d727053..00000000000 --- a/fs/befs/attribute.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * linux/fs/befs/attribute.c - * - * Copyright (C) 2002 Will Dyson - * - * Many thanks to Dominic Giampaolo, author of "Practical File System - * Design with the Be File System", for such a helpful book. - * - */ - -#include -#include -#include - -#include "befs.h" -#include "endian.h" - -#define SD_DATA(sd)\ - (void*)((char*)sd + sizeof(*sd) + (sd->name_size - sizeof(sd->name))) - -#define SD_NEXT(sd)\ - (befs_small_data*)((char*)sd + sizeof(*sd) + (sd->name_size - \ - sizeof(sd->name) + sd->data_size)) - -int -list_small_data(struct super_block *sb, befs_inode * inode, filldir_t filldir); - -befs_small_data * -find_small_data(struct super_block *sb, befs_inode * inode, - const char *name); -int -read_small_data(struct super_block *sb, befs_inode * inode, - befs_small_data * sdata, void *buf, size_t bufsize); - -/** - * - * - * - * - * - */ -befs_small_data * -find_small_data(struct super_block *sb, befs_inode * inode, const char *name) -{ - befs_small_data *sdata = inode->small_data; - - while (sdata->type != 0) { - if (strcmp(name, sdata->name) != 0) { - return sdata; - } - sdata = SD_NEXT(sdata); - } - return NULL; -} - -/** - * - * - * - * - * - */ -int -read_small_data(struct super_block *sb, befs_inode * inode, - const char *name, void *buf, size_t bufsize) -{ - befs_small_data *sdata; - - sdata = find_small_data(sb, inode, name); - if (sdata == NULL) - return BEFS_ERR; - else if (sdata->data_size > bufsize) - return BEFS_ERR; - - memcpy(buf, SD_DATA(sdata), sdata->data_size); - - return BEFS_OK; -} - -/** - * - * - * - * - * - */ -int -list_small_data(struct super_block *sb, befs_inode * inode) -{ - -} - -/** - * - * - * - * - * - */ -int -list_attr(struct super_block *sb, befs_inode * inode) -{ - -} - -/** - * - * - * - * - * - */ -int -read_attr(struct super_block *sb, befs_inode * inode) -{ - -} From 9f56f743e8dcc470322c7efd5d307a32665ba05c Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:56:17 +0100 Subject: [PATCH 10/13] fs/afs/callback.c should #include "cmservice.h" Every file should include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/afs/callback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/afs/callback.c b/fs/afs/callback.c index 2fd62f89ae0..9cb206e9d4b 100644 --- a/fs/afs/callback.c +++ b/fs/afs/callback.c @@ -19,6 +19,7 @@ #include "server.h" #include "vnode.h" #include "internal.h" +#include "cmservice.h" /*****************************************************************************/ /* From 9abdc4cd8a81a3c29e051eb12963757ac60bd440 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 Nov 2005 16:57:02 +0100 Subject: [PATCH 11/13] fs/ioprio.c should #include Every file should include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk --- fs/ioprio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ioprio.c b/fs/ioprio.c index d1c1f2b2c9d..4bf1c6365a1 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c @@ -22,6 +22,7 @@ #include #include #include +#include static int set_task_ioprio(struct task_struct *task, int ioprio) { From f668ab1acc05fc3f525b97db613b2d1f99efd957 Mon Sep 17 00:00:00 2001 From: Luben Tuikov Date: Tue, 8 Nov 2005 17:14:08 +0100 Subject: [PATCH 12/13] include/linux: enclose idr.h in #ifndef This patch encloses the idr.h header file in #ifndef __IDR_H__ macro. Signed-off-by: Luben Tuikov Signed-off-by: Adrian Bunk --- include/linux/idr.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/idr.h b/include/linux/idr.h index 7fb3ff9c7b0..d37c8d808b0 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h @@ -8,6 +8,10 @@ * Small id to pointer translation service avoiding fixed sized * tables. */ + +#ifndef __IDR_H__ +#define __IDR_H__ + #include #include @@ -77,3 +81,5 @@ int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id); void idr_remove(struct idr *idp, int id); void idr_destroy(struct idr *idp); void idr_init(struct idr *idp); + +#endif /* __IDR_H__ */ From b2d1a8adc9cf3bde32a18a1a1856641638a9c729 Mon Sep 17 00:00:00 2001 From: Jim Cromie Date: Tue, 8 Nov 2005 17:16:50 +0100 Subject: [PATCH 13/13] earlyuserspace/README: fix homonym err Signed-off-by: Jim Cromie Signed-off-by: Adrian Bunk --- Documentation/early-userspace/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/early-userspace/README b/Documentation/early-userspace/README index 270a88e22fb..cddbac456c2 100644 --- a/Documentation/early-userspace/README +++ b/Documentation/early-userspace/README @@ -28,7 +28,7 @@ the image from specifications. CPIO ARCHIVE method You can create a cpio archive that contains the early userspace image. -Youre cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it +Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it will be used directly. Only a single cpio file may be specified in CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in combination with a cpio archive.