patch-2.3.99-pre7 linux/fs/smbfs/file.c

• Lines: 32
• Date: Mon May 8 13:51:01 2000
• Orig file: v2.3.99-pre6/linux/fs/smbfs/file.c
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/fs/smbfs/file.c linux/fs/smbfs/file.c
@@ -56,7 +56,7 @@
 
 	/* We can't replace this with ClearPageError. why? is it a problem? 
 	   fs/buffer.c:brw_page does the same. */
-	/* clear_bit(PG_error, &page->flags); */
+	/* ClearPageError(page); */
 
 #ifdef SMBFS_DEBUG_VERBOSE
 printk("smb_readpage_sync: file %s/%s, count=%d@%ld, rsize=%d\n",
@@ -98,9 +98,10 @@
 }
 
 static int
-smb_readpage(struct dentry *dentry, struct page *page)
+smb_readpage(struct file *file, struct page *page)
 {
 	int		error;
+	struct dentry  *dentry = file->f_dentry;
 
 	pr_debug("SMB: smb_readpage %08lx\n", page_address(page));
 #ifdef SMBFS_PARANOIA
@@ -167,8 +168,9 @@
  * We are called with the page locked and the caller unlocks.
  */
 static int
-smb_writepage(struct file *file, struct dentry *dentry, struct page *page)
+smb_writepage(struct file *file, struct page *page)
 {
+	struct dentry *dentry = file->f_dentry;
 	struct inode *inode = dentry->d_inode;
 	unsigned long end_index = inode->i_size >> PAGE_CACHE_SHIFT;
 	unsigned offset = PAGE_CACHE_SIZE;