diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/ncpfs | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/dir.c | 17 | ||||
| -rw-r--r-- | fs/ncpfs/file.c | 19 | ||||
| -rw-r--r-- | fs/ncpfs/inode.c | 5 | ||||
| -rw-r--r-- | fs/ncpfs/symlink.c | 4 |
4 files changed, 12 insertions, 33 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 565f88c5b..e5e91a24c 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -47,17 +47,9 @@ extern int ncp_symlink(struct inode *, struct dentry *, const char *); static struct file_operations ncp_dir_operations = { - NULL, /* lseek - default */ - ncp_dir_read, /* read - bad */ - NULL, /* write - bad */ - ncp_readdir, /* readdir */ - NULL, /* poll - default */ - ncp_ioctl, /* ioctl */ - NULL, /* mmap */ - NULL, /* no special open code */ - NULL, /* flush */ - NULL, /* no special release code */ - NULL /* fsync */ + read: ncp_dir_read, + readdir: ncp_readdir, + ioctl: ncp_ioctl, }; struct inode_operations ncp_dir_inode_operations = @@ -78,9 +70,6 @@ struct inode_operations ncp_dir_inode_operations = ncp_rename, /* rename */ NULL, /* readlink */ NULL, /* follow link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ NULL, /* permission */ NULL, /* revalidate */ diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 5e28516bf..09b95cd4f 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -277,17 +277,11 @@ out: static struct file_operations ncp_file_operations = { - NULL, /* lseek - default */ - ncp_file_read, /* read */ - ncp_file_write, /* write */ - NULL, /* readdir - bad */ - NULL, /* poll - default */ - ncp_ioctl, /* ioctl */ - ncp_mmap, /* mmap */ - NULL, /* open */ - NULL, /* flush */ - NULL, /* release */ - ncp_fsync, /* fsync */ + read: ncp_file_read, + write: ncp_file_write, + ioctl: ncp_ioctl, + mmap: ncp_mmap, + fsync: ncp_fsync, }; struct inode_operations ncp_file_inode_operations = @@ -304,9 +298,6 @@ struct inode_operations ncp_file_inode_operations = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ NULL, /* permission */ NULL /* revalidate */ diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 84b9e5643..5a4e790a7 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -51,7 +51,7 @@ static struct super_operations ncp_sops = extern struct dentry_operations ncp_dentry_operations; #ifdef CONFIG_NCPFS_EXTRAS -extern struct inode_operations ncp_symlink_inode_operations; +extern struct address_space_operations ncp_symlink_aops; extern int ncp_symlink(struct inode*, struct dentry*, const char*); #endif @@ -226,7 +226,8 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info) inode->i_op = &ncp_dir_inode_operations; #ifdef CONFIG_NCPFS_EXTRAS } else if (S_ISLNK(inode->i_mode)) { - inode->i_op = &ncp_symlink_inode_operations; + inode->i_op = &page_symlink_inode_operations; + inode->i_data.a_ops = &ncp_symlink_aops; #endif } insert_inode_hash(inode); diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index 5e5bf2fbd..b0bc34b22 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c @@ -96,9 +96,7 @@ fail: /* * symlinks can't do much... */ -struct inode_operations ncp_symlink_inode_operations={ - readlink: page_readlink, - follow_link: page_follow_link, +struct address_space_operations ncp_symlink_aops = { readpage: ncp_symlink_readpage, }; |