diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/ncpfs/dir.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/ncpfs/dir.c')
| -rw-r--r-- | fs/ncpfs/dir.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index e5e91a24c..5c23664e3 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -31,7 +31,6 @@ static void ncp_read_volume_list(struct file *, void *, filldir_t, static void ncp_do_readdir(struct file *, void *, filldir_t, struct ncp_cache_control *); -static ssize_t ncp_dir_read(struct file *, char *, size_t, loff_t *); static int ncp_readdir(struct file *, void *, filldir_t); static int ncp_create(struct inode *, struct dentry *, int); @@ -45,42 +44,27 @@ static int ncp_rename(struct inode *, struct dentry *, extern int ncp_symlink(struct inode *, struct dentry *, const char *); #endif -static struct file_operations ncp_dir_operations = +struct file_operations ncp_dir_operations = { - read: ncp_dir_read, + read: generic_read_dir, readdir: ncp_readdir, ioctl: ncp_ioctl, }; struct inode_operations ncp_dir_inode_operations = { - &ncp_dir_operations, /* default directory file ops */ - ncp_create, /* create */ - ncp_lookup, /* lookup */ - NULL, /* link */ - ncp_unlink, /* unlink */ + create: ncp_create, + lookup: ncp_lookup, + unlink: ncp_unlink, #ifdef CONFIG_NCPFS_EXTRAS - ncp_symlink, /* symlink */ -#else - NULL, /* symlink */ + symlink: ncp_symlink, #endif - ncp_mkdir, /* mkdir */ - ncp_rmdir, /* rmdir */ - NULL, /* mknod */ - ncp_rename, /* rename */ - NULL, /* readlink */ - NULL, /* follow link */ - NULL, /* truncate */ - NULL, /* permission */ - NULL, /* revalidate */ + mkdir: ncp_mkdir, + rmdir: ncp_rmdir, + rename: ncp_rename, + setattr: ncp_notify_change, }; -static ssize_t -ncp_dir_read(struct file *filp, char *buf, size_t count, loff_t *ppos) -{ - return -EISDIR; -} - /* * Dentry operations routines */ |