projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED.
[powerpc.git]
/
fs
/
smbfs
/
inode.c
diff --git
a/fs/smbfs/inode.c
b/fs/smbfs/inode.c
index
2c122ee
..
5faba4f
100644
(file)
--- a/
fs/smbfs/inode.c
+++ b/
fs/smbfs/inode.c
@@
-50,12
+50,12
@@
static void smb_put_super(struct super_block *);
static int smb_statfs(struct dentry *, struct kstatfs *);
static int smb_show_options(struct seq_file *, struct vfsmount *);
static int smb_statfs(struct dentry *, struct kstatfs *);
static int smb_show_options(struct seq_file *, struct vfsmount *);
-static
kmem_cache_t
*smb_inode_cachep;
+static
struct kmem_cache
*smb_inode_cachep;
static struct inode *smb_alloc_inode(struct super_block *sb)
{
struct smb_inode_info *ei;
static struct inode *smb_alloc_inode(struct super_block *sb)
{
struct smb_inode_info *ei;
- ei = (struct smb_inode_info *)kmem_cache_alloc(smb_inode_cachep,
SLAB
_KERNEL);
+ ei = (struct smb_inode_info *)kmem_cache_alloc(smb_inode_cachep,
GFP
_KERNEL);
if (!ei)
return NULL;
return &ei->vfs_inode;
if (!ei)
return NULL;
return &ei->vfs_inode;
@@
-66,7
+66,7
@@
static void smb_destroy_inode(struct inode *inode)
kmem_cache_free(smb_inode_cachep, SMB_I(inode));
}
kmem_cache_free(smb_inode_cachep, SMB_I(inode));
}
-static void init_once(void * foo,
kmem_cache_t
* cachep, unsigned long flags)
+static void init_once(void * foo,
struct kmem_cache
* cachep, unsigned long flags)
{
struct smb_inode_info *ei = (struct smb_inode_info *) foo;
unsigned long flagmask = SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR;
{
struct smb_inode_info *ei = (struct smb_inode_info *) foo;
unsigned long flagmask = SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR;
@@
-98,7
+98,7
@@
static int smb_remount(struct super_block *sb, int *flags, char *data)
return 0;
}
return 0;
}
-static struct super_operations smb_sops =
+static
const
struct super_operations smb_sops =
{
.alloc_inode = smb_alloc_inode,
.destroy_inode = smb_destroy_inode,
{
.alloc_inode = smb_alloc_inode,
.destroy_inode = smb_destroy_inode,
@@
-482,12
+482,13
@@
smb_put_super(struct super_block *sb)
smb_close_socket(server);
if (server->conn_pid)
smb_close_socket(server);
if (server->conn_pid)
- kill_p
roc
(server->conn_pid, SIGTERM, 1);
+ kill_p
id
(server->conn_pid, SIGTERM, 1);
kfree(server->ops);
smb_unload_nls(server);
sb->s_fs_info = NULL;
smb_unlock_server(server);
kfree(server->ops);
smb_unload_nls(server);
sb->s_fs_info = NULL;
smb_unlock_server(server);
+ put_pid(server->conn_pid);
kfree(server);
}
kfree(server);
}
@@
-530,7
+531,7
@@
static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
INIT_LIST_HEAD(&server->xmitq);
INIT_LIST_HEAD(&server->recvq);
server->conn_error = 0;
INIT_LIST_HEAD(&server->xmitq);
INIT_LIST_HEAD(&server->recvq);
server->conn_error = 0;
- server->conn_pid =
0
;
+ server->conn_pid =
NULL
;
server->state = CONN_INVALID; /* no connection yet */
server->generation = 0;
server->state = CONN_INVALID; /* no connection yet */
server->generation = 0;