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 branch 'master' into gfs2
[pandora-kernel.git]
/
fs
/
ncpfs
/
inode.c
diff --git
a/fs/ncpfs/inode.c
b/fs/ncpfs/inode.c
index
6c51c11
..
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>
@@
-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)
@@
-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)