diff options
Diffstat (limited to 'fs/ncpfs/inode.c')
-rw-r--r-- | fs/ncpfs/inode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index a1f3e972c6ef..1ddf77b0b825 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
14 | 13 | ||
15 | #include <asm/system.h> | 14 | #include <asm/system.h> |
@@ -39,7 +38,7 @@ | |||
39 | 38 | ||
40 | static void ncp_delete_inode(struct inode *); | 39 | static void ncp_delete_inode(struct inode *); |
41 | static void ncp_put_super(struct super_block *); | 40 | static void ncp_put_super(struct super_block *); |
42 | static int ncp_statfs(struct super_block *, struct kstatfs *); | 41 | static int ncp_statfs(struct dentry *, struct kstatfs *); |
43 | 42 | ||
44 | static kmem_cache_t * ncp_inode_cachep; | 43 | static kmem_cache_t * ncp_inode_cachep; |
45 | 44 | ||
@@ -105,7 +104,7 @@ static struct super_operations ncp_sops = | |||
105 | 104 | ||
106 | extern struct dentry_operations ncp_root_dentry_operations; | 105 | extern struct dentry_operations ncp_root_dentry_operations; |
107 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) | 106 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) |
108 | extern struct address_space_operations ncp_symlink_aops; | 107 | extern const struct address_space_operations ncp_symlink_aops; |
109 | extern int ncp_symlink(struct inode*, struct dentry*, const char*); | 108 | extern int ncp_symlink(struct inode*, struct dentry*, const char*); |
110 | #endif | 109 | #endif |
111 | 110 | ||
@@ -724,13 +723,14 @@ static void ncp_put_super(struct super_block *sb) | |||
724 | kfree(server); | 723 | kfree(server); |
725 | } | 724 | } |
726 | 725 | ||
727 | static int ncp_statfs(struct super_block *sb, struct kstatfs *buf) | 726 | static int ncp_statfs(struct dentry *dentry, struct kstatfs *buf) |
728 | { | 727 | { |
729 | struct dentry* d; | 728 | struct dentry* d; |
730 | struct inode* i; | 729 | struct inode* i; |
731 | struct ncp_inode_info* ni; | 730 | struct ncp_inode_info* ni; |
732 | struct ncp_server* s; | 731 | struct ncp_server* s; |
733 | struct ncp_volume_info vi; | 732 | struct ncp_volume_info vi; |
733 | struct super_block *sb = dentry->d_sb; | ||
734 | int err; | 734 | int err; |
735 | __u8 dh; | 735 | __u8 dh; |
736 | 736 | ||
@@ -957,10 +957,10 @@ out: | |||
957 | return result; | 957 | return result; |
958 | } | 958 | } |
959 | 959 | ||
960 | static struct super_block *ncp_get_sb(struct file_system_type *fs_type, | 960 | static int ncp_get_sb(struct file_system_type *fs_type, |
961 | int flags, const char *dev_name, void *data) | 961 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
962 | { | 962 | { |
963 | return get_sb_nodev(fs_type, flags, data, ncp_fill_super); | 963 | return get_sb_nodev(fs_type, flags, data, ncp_fill_super, mnt); |
964 | } | 964 | } |
965 | 965 | ||
966 | static struct file_system_type ncp_fs_type = { | 966 | static struct file_system_type ncp_fs_type = { |