A couple of minor gotchas. The attached patch set should take of things.
Apply to otherwise clean 2.3.1 tree.
-- Bob Tracy | "They couldn't hit an elephant at this dist- " Firewall Security Corp. | - Last words of Union General John Sedgwick, rct@frus.com | Battle of Spotsylvania Court House, U.S. Civil War--ELM926697920-6928-0_ Content-Type: text/plain; charset=US-ASCII Content-Disposition: attachment; filename=patch01_idescsi Content-Description: patch01_idescsi Content-Transfer-Encoding: 7bit
--- linux/drivers/scsi/ide-scsi.c.orig Wed May 5 14:08:50 1999 +++ linux/drivers/scsi/ide-scsi.c Fri May 14 10:20:03 1999 @@ -45,7 +45,7 @@ #include <asm/bitops.h> #include <asm/uaccess.h> -#include "../block/ide.h" +#include <linux/ide.h> #include "scsi.h" #include "hosts.h"
--ELM926697920-6928-0_ Content-Type: text/plain; charset=US-ASCII Content-Disposition: attachment; filename=patch01_hfs Content-Description: patch01_hfs Content-Transfer-Encoding: 7bit
--- linux/fs/hfs/bnode.c.orig Fri May 14 09:56:19 1999 +++ linux/fs/hfs/bnode.c Fri May 14 10:56:38 1999 @@ -228,7 +228,7 @@ break; case HFS_LOCK_NONE: - while (bn->lock || witqueue_active(&bn->wqueue)) { + while (bn->lock || waitqueue_active(&bn->wqueue)) { hfs_sleep_on(&bn->rqueue); } ++bn->count; --- linux/fs/hfs/catalog.c.orig Fri May 14 09:56:19 1999 +++ linux/fs/hfs/catalog.c Fri May 14 10:56:09 1999 @@ -647,7 +647,7 @@ */ static inline void start_write(struct hfs_cat_entry *dir) { - if (dir->u.dir.readers || wait_queue_active(&dir->u.dir.read_wait)) { + if (dir->u.dir.readers || waitqueue_active(&dir->u.dir.read_wait)) { hfs_sleep_on(&dir->u.dir.write_wait); } ++dir->u.dir.writers; @@ -658,7 +658,7 @@ */ static inline void start_read(struct hfs_cat_entry *dir) { - if (dir->u.dir.writers || wait_queue_active(&dir->u.dir.write_wait)) { + if (dir->u.dir.writers || waitqueue_active(&dir->u.dir.write_wait)) { hfs_sleep_on(&dir->u.dir.read_wait); } ++dir->u.dir.readers;
--ELM926697920-6928-0_ Content-Type: text/plain; charset=US-ASCII Content-Disposition: attachment; filename=patch01_smbinode Content-Description: patch01_smbinode Content-Transfer-Encoding: 7bit
--- linux/fs/smbfs/inode.c.orig Fri May 14 09:56:19 1999 +++ linux/fs/smbfs/inode.c Fri May 14 10:28:24 1999 @@ -88,7 +88,7 @@ result->i_op = &smb_dir_inode_operations; else result->i_op = NULL; - insert_inode_hash(result) + insert_inode_hash(result); return result; }
--ELM926697920-6928-0_--
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/