git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
scsi_proc.c
diff --git
a/drivers/scsi/scsi_proc.c
b/drivers/scsi/scsi_proc.c
index
126225b
..
a50958b
100644
(file)
--- a/
drivers/scsi/scsi_proc.c
+++ b/
drivers/scsi/scsi_proc.c
@@
-27,8
+27,9
@@
#include <linux/seq_file.h>
#include <asm/uaccess.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_host.h>
-#include "scsi.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
@@
-54,7
+55,7
@@
static int proc_scsi_read(char *buffer, char **start, off_t offset,
return n;
}
return n;
}
-static int proc_scsi_write_proc(struct file *file, const char *buf,
+static int proc_scsi_write_proc(struct file *file, const char
__user
*buf,
unsigned long count, void *data)
{
struct Scsi_Host *shost = data;
unsigned long count, void *data)
{
struct Scsi_Host *shost = data;
@@
-311,7
+312,7
@@
int __init scsi_init_procfs(void)
{
struct proc_dir_entry *pde;
{
struct proc_dir_entry *pde;
- proc_scsi = proc_mkdir("scsi",
0
);
+ proc_scsi = proc_mkdir("scsi",
NULL
);
if (!proc_scsi)
goto err1;
if (!proc_scsi)
goto err1;
@@
-323,13
+324,13
@@
int __init scsi_init_procfs(void)
return 0;
err2:
return 0;
err2:
- remove_proc_entry("scsi",
0
);
+ remove_proc_entry("scsi",
NULL
);
err1:
return -ENOMEM;
}
void scsi_exit_procfs(void)
{
err1:
return -ENOMEM;
}
void scsi_exit_procfs(void)
{
- remove_proc_entry("scsi/scsi",
0
);
- remove_proc_entry("scsi",
0
);
+ remove_proc_entry("scsi/scsi",
NULL
);
+ remove_proc_entry("scsi",
NULL
);
}
}