3 files changed, 8 insertions, 12 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 358060020..83139f492 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -20,8 +20,7 @@ static long proc_file_read(struct inode * inode, struct file * file,
 			   char * buf, unsigned long nbytes);
 static long proc_file_write(struct inode * inode, struct file * file,
 			    const char * buffer, unsigned long count);
-static long long proc_file_lseek(struct inode * inode, struct file * file, 
-				 long long offset, int orig);
+static long long proc_file_lseek(struct file * file, long long offset, int orig);
 
 int proc_match(int len, const char *name,struct proc_dir_entry * de)
 {
@@ -190,8 +189,7 @@ proc_file_write(struct inode * inode, struct file * file,
 }
 
 
-static long long proc_file_lseek(struct inode * inode, struct file * file, 
-				 long long offset, int orig)
+static long long proc_file_lseek(struct file * file, long long offset, int orig)
 {
     switch (orig) {
     case 0:
diff --git a/fs/proc/mem.c b/fs/proc/mem.c
index 97acb5ee8..126683ea4 100644
--- a/fs/proc/mem.c
+++ b/fs/proc/mem.c
@@ -187,8 +187,7 @@ static long mem_write(struct inode * inode, struct file * file,
 
 #endif
 
-static long long mem_lseek(struct inode * inode, struct file * file,
-	long long offset, int orig)
+static long long mem_lseek(struct file * file, long long offset, int orig)
 {
 	switch (orig) {
 		case 0:
@@ -205,8 +204,7 @@ static long long mem_lseek(struct inode * inode, struct file * file,
 /*
  * This isn't really reliable by any means..
  */
-int mem_mmap(struct inode * inode, struct file * file,
-	     struct vm_area_struct * vma)
+int mem_mmap(struct file * file, struct vm_area_struct * vma)
 {
 	struct task_struct *tsk;
 	pgd_t *src_dir, *dest_dir;
@@ -214,7 +212,8 @@ int mem_mmap(struct inode * inode, struct file * file,
 	pte_t *src_table, *dest_table;
 	unsigned long stmp, dtmp;
 	struct vm_area_struct *src_vma = NULL;
-
+	struct inode *inode = file->f_dentry->d_inode;
+	
 	/* Get the source's task information */
 
 	tsk = get_task(inode->i_ino >> 16);
diff --git a/fs/proc/scsi.c b/fs/proc/scsi.c
index b1e77398c..831a2623d 100644
--- a/fs/proc/scsi.c
+++ b/fs/proc/scsi.c
@@ -33,7 +33,7 @@ static long proc_readscsi(struct inode * inode, struct file * file,
 			 char * buf, unsigned long count);
 static long proc_writescsi(struct inode * inode, struct file * file,
 			 const char * buf, unsigned long count);
-static long long proc_scsilseek(struct inode *, struct file *, long long, int);
+static long long proc_scsilseek(struct file *, long long, int);
 
 extern void build_proc_dir_hba_entries(uint);
 
@@ -177,8 +177,7 @@ static long proc_writescsi(struct inode * inode, struct file * file,
 }
 
 
-static long long proc_scsilseek(struct inode * inode, struct file * file, 
-				long long offset, int orig)
+static long long proc_scsilseek(struct file * file, long long offset, int orig)
 {
     switch (orig) {
     case 0: