git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
smbfs
/
inode.c
diff --git
a/fs/smbfs/inode.c
b/fs/smbfs/inode.c
index
fdeabc0
..
84dfe3f
100644
(file)
--- a/
fs/smbfs/inode.c
+++ b/
fs/smbfs/inode.c
@@
-7,7
+7,6
@@
* Please add a note about your changes to smbfs in the ChangeLog file.
*/
* Please add a note about your changes to smbfs in the ChangeLog file.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/time.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/time.h>
#include <linux/kernel.h>
@@
-48,15
+47,15
@@
static void smb_delete_inode(struct inode *);
static void smb_put_super(struct super_block *);
static void smb_delete_inode(struct inode *);
static void smb_put_super(struct super_block *);
-static int smb_statfs(struct
super_block
*, struct kstatfs *);
+static int smb_statfs(struct
dentry
*, struct kstatfs *);
static int smb_show_options(struct seq_file *, struct vfsmount *);
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;
@@
-67,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;
@@
-90,8
+89,7
@@
static int init_inodecache(void)
static void destroy_inodecache(void)
{
static void destroy_inodecache(void)
{
- if (kmem_cache_destroy(smb_inode_cachep))
- printk(KERN_INFO "smb_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(smb_inode_cachep);
}
static int smb_remount(struct super_block *sb, int *flags, char *data)
}
static int smb_remount(struct super_block *sb, int *flags, char *data)
@@
-168,7
+166,6
@@
smb_get_inode_attr(struct inode *inode, struct smb_fattr *fattr)
fattr->f_mtime = inode->i_mtime;
fattr->f_ctime = inode->i_ctime;
fattr->f_atime = inode->i_atime;
fattr->f_mtime = inode->i_mtime;
fattr->f_ctime = inode->i_ctime;
fattr->f_atime = inode->i_atime;
- fattr->f_blksize= inode->i_blksize;
fattr->f_blocks = inode->i_blocks;
fattr->attr = SMB_I(inode)->attr;
fattr->f_blocks = inode->i_blocks;
fattr->attr = SMB_I(inode)->attr;
@@
-202,7
+199,6
@@
smb_set_inode_attr(struct inode *inode, struct smb_fattr *fattr)
inode->i_uid = fattr->f_uid;
inode->i_gid = fattr->f_gid;
inode->i_ctime = fattr->f_ctime;
inode->i_uid = fattr->f_uid;
inode->i_gid = fattr->f_gid;
inode->i_ctime = fattr->f_ctime;
- inode->i_blksize= fattr->f_blksize;
inode->i_blocks = fattr->f_blocks;
inode->i_size = fattr->f_size;
inode->i_mtime = fattr->f_mtime;
inode->i_blocks = fattr->f_blocks;
inode->i_size = fattr->f_size;
inode->i_mtime = fattr->f_mtime;
@@
-486,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);
}
@@
-534,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;
@@
-641,13
+638,13
@@
out_no_server:
}
static int
}
static int
-smb_statfs(struct
super_block *sb
, struct kstatfs *buf)
+smb_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
int result;
lock_kernel();
{
int result;
lock_kernel();
- result = smb_proc_dskattr(
sb
, buf);
+ result = smb_proc_dskattr(
dentry
, buf);
unlock_kernel();
unlock_kernel();
@@
-782,10
+779,10
@@
out:
return error;
}
return error;
}
-static
struct super_block *
smb_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
smb_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_nodev(fs_type, flags, data, smb_fill_super);
+ return get_sb_nodev(fs_type, flags, data, smb_fill_super
, mnt
);
}
static struct file_system_type smb_fs_type = {
}
static struct file_system_type smb_fs_type = {