git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
fs
/
ncpfs
/
inode.c
diff --git
a/fs/ncpfs/inode.c
b/fs/ncpfs/inode.c
index
8db033f
..
42e3bef
100644
(file)
--- a/
fs/ncpfs/inode.c
+++ b/
fs/ncpfs/inode.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <asm/system.h>
#include <linux/module.h>
#include <asm/system.h>
@@
-39,7
+38,7
@@
static void ncp_delete_inode(struct inode *);
static void ncp_put_super(struct super_block *);
static void ncp_delete_inode(struct inode *);
static void ncp_put_super(struct super_block *);
-static int ncp_statfs(struct
super_block
*, struct kstatfs *);
+static int ncp_statfs(struct
dentry
*, struct kstatfs *);
static kmem_cache_t * ncp_inode_cachep;
static kmem_cache_t * ncp_inode_cachep;
@@
-82,8
+81,7
@@
static int init_inodecache(void)
static void destroy_inodecache(void)
{
static void destroy_inodecache(void)
{
- if (kmem_cache_destroy(ncp_inode_cachep))
- printk(KERN_INFO "ncp_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(ncp_inode_cachep);
}
static int ncp_remount(struct super_block *sb, int *flags, char* data)
}
static int ncp_remount(struct super_block *sb, int *flags, char* data)
@@
-105,7
+103,7
@@
static struct super_operations ncp_sops =
extern struct dentry_operations ncp_root_dentry_operations;
#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
extern struct dentry_operations ncp_root_dentry_operations;
#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
-extern struct address_space_operations ncp_symlink_aops;
+extern
const
struct address_space_operations ncp_symlink_aops;
extern int ncp_symlink(struct inode*, struct dentry*, const char*);
#endif
extern int ncp_symlink(struct inode*, struct dentry*, const char*);
#endif
@@
-225,7
+223,6
@@
static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo)
inode->i_nlink = 1;
inode->i_uid = server->m.uid;
inode->i_gid = server->m.gid;
inode->i_nlink = 1;
inode->i_uid = server->m.uid;
inode->i_gid = server->m.gid;
- inode->i_blksize = NCP_BLOCK_SIZE;
ncp_update_dates(inode, &nwinfo->i);
ncp_update_inode(inode, nwinfo);
ncp_update_dates(inode, &nwinfo->i);
ncp_update_inode(inode, nwinfo);
@@
-412,11
+409,10
@@
static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
#endif
struct ncp_entry_info finfo;
#endif
struct ncp_entry_info finfo;
- server = k
m
alloc(sizeof(struct ncp_server), GFP_KERNEL);
+ server = k
z
alloc(sizeof(struct ncp_server), GFP_KERNEL);
if (!server)
return -ENOMEM;
sb->s_fs_info = server;
if (!server)
return -ENOMEM;
sb->s_fs_info = server;
- memset(server, 0, sizeof(struct ncp_server));
error = -EFAULT;
if (raw_data == NULL)
error = -EFAULT;
if (raw_data == NULL)
@@
-724,13
+720,14
@@
static void ncp_put_super(struct super_block *sb)
kfree(server);
}
kfree(server);
}
-static int ncp_statfs(struct
super_block *sb
, struct kstatfs *buf)
+static int ncp_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
struct dentry* d;
struct inode* i;
struct ncp_inode_info* ni;
struct ncp_server* s;
struct ncp_volume_info vi;
{
struct dentry* d;
struct inode* i;
struct ncp_inode_info* ni;
struct ncp_server* s;
struct ncp_volume_info vi;
+ struct super_block *sb = dentry->d_sb;
int err;
__u8 dh;
int err;
__u8 dh;