lkml.org 
[lkml]   [1999]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
From
Subjecta few minor patches against 2.3.1
Date
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
--- 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"--- 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;--- 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;
}
\
 
 \ /
  Last update: 2005-03-22 13:51    [W:0.057 / U:0.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site