Messages in this thread Patch in this message | | | Date | Sun, 01 Mar 1998 00:00:31 -0000 (WET) | From | "Manuel J. Galan" <> | Subject | RE: Compilation error in smbfs in 2.1.89-pre-4 |
| |
Maybe this will of some help... --------------------------------------------------------------------------------
--- fs/smbfs/file.c Wed Jan 21 18:09:31 1998 +++ /usr/src/linux/fs/smbfs/file.c Sat Feb 28 21:37:47 1998 @@ -102,8 +102,9 @@ } int -smb_readpage(struct dentry *dentry, struct page *page) +smb_readpage(struct file *file, struct page *page) { + struct dentry *dentry = file->f_dentry; int error; pr_debug("SMB: smb_readpage %08lx\n", page_address(page)); @@ -177,8 +178,9 @@ * (for now), and we currently do this synchronously only. */ static int -smb_writepage(struct dentry *dentry, struct page *page) +smb_writepage(struct file *file, struct page *page) { + struct dentry *dentry = file->f_dentry; int result; #ifdef SMBFS_PARANOIA @@ -193,9 +195,10 @@ } static int -smb_updatepage(struct dentry *dentry, struct page *page, const char *buffer, +smb_updatepage(struct file *file, struct page *page, const char *buffer, unsigned long offset, unsigned int count, int sync) { + struct dentry *dentry = file->f_dentry; unsigned long page_addr = page_address(page); int result; --- fs/smbfs/inode.c Wed Jan 21 18:09:31 1998 +++ /usr/src/linux/fs/smbfs/inode.c Sat Feb 28 21:17:33 1998 @@ -19,6 +19,7 @@ #include <linux/malloc.h> #include <linux/init.h> #include <linux/dcache.h> +#include <linux/file.h> #include <linux/smb_fs.h> #include <linux/smbno.h> @@ -326,7 +327,8 @@ if (server->sock_file) { smb_proc_disconnect(server); smb_dont_catch_keepalive(server); - close_fp(server->sock_file); + /* close_fp(server->sock_file); */ + fput(server->sock_file); } if (server->conn_pid) --- fs/smbfs/sock.c Thu Dec 11 19:25:54 1997 +++ /usr/src/linux/fs/smbfs/sock.c Sat Feb 28 21:18:13 1998 @@ -14,6 +14,7 @@ #include <linux/net.h> #include <linux/mm.h> #include <linux/netdevice.h> +#include <linux/file.h> #include <net/scm.h> #include <net/ip.h> @@ -259,7 +260,8 @@ printk("smb_close_socket: still catching keepalives!\n"); #endif server->sock_file = NULL; - close_fp(file); + /* close_fp(file); */ + fput(file); } } --- fs/coda/file.c Sat Feb 28 21:42:09 1998 +++ /usr/src/linux/fs/coda/file.c Sat Feb 28 21:24:02 1998 @@ -16,6 +16,7 @@ #include <linux/locks.h> #include <asm/segment.h> #include <linux/string.h> +#include <linux/file.h> #include <asm/uaccess.h> #include <linux/coda.h> @@ -25,7 +26,7 @@ #include <linux/coda_cache.h> /* file operations */ -static int coda_readpage(struct dentry * dentry, struct page * page); +static int coda_readpage(struct file * file, struct page * page); static ssize_t coda_file_read(struct file *f, char *buf, size_t count, loff_t *off); static ssize_t coda_file_write(struct file *f, const char *buf, size_t count, loff_t *off); static int coda_file_mmap(struct file * file, struct vm_area_struct * vma); @@ -74,9 +75,11 @@ }; /* File file operations */ -static int coda_readpage(struct dentry *de, struct page * page) +static int coda_readpage(struct file *file, struct page * page) { + struct dentry *de = file->f_dentry; struct inode *inode = de->d_inode; + struct file cont_file; struct dentry cont_dentry; struct inode *cont_inode; struct cnode *cnp; @@ -93,10 +96,11 @@ cont_inode = cnp->c_ovp; cont_dentry.d_inode = cont_inode; + cont_file.f_dentry = &cont_dentry; CDEBUG(D_INODE, "coda ino: %ld, cached ino %ld, page offset: %lx\n", inode->i_ino, cont_inode->i_ino, page->offset); - generic_readpage(&cont_dentry, page); + generic_readpage(&cont_file, page); EXIT; return 0; } --- fs/fat/mmap.c Sat Feb 28 21:42:57 1998 +++ /usr/src/linux/fs/fat/mmap.c Sat Feb 28 21:48:21 1998 @@ -119,8 +119,9 @@ } -int fat_readpage(struct dentry * dentry, struct page * page) +int fat_readpage(struct file * file, struct page * page) { + struct dentry * dentry = file->f_dentry; struct inode * inode = dentry->d_inode; if (MSDOS_SB(inode->i_sb)->cvf_format && MSDOS_SB(inode->i_sb)->cvf_format->cvf_readpage) --- include/linux/msdos_fs.h Sat Jan 24 01:21:02 1998 +++ /usr/src/linux/include/linux/msdos_fs.h Sat Feb 28 21:50:26 1998 @@ -255,7 +255,7 @@ /* mmap.c */ extern int fat_mmap(struct file *, struct vm_area_struct *); -extern int fat_readpage(struct dentry *, struct page *); +extern int fat_readpage(struct file *, struct page *); /* vfat.c */ -------------------------------------------------------------------------------- -- Manuel J. Galan manolow@step.es
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu
| |