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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
smbfs
/
inode.c
diff --git
a/fs/smbfs/inode.c
b/fs/smbfs/inode.c
index
fdeabc0
..
3c5c3d8
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,7
+47,7
@@
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 kmem_cache_t *smb_inode_cachep;
static int smb_show_options(struct seq_file *, struct vfsmount *);
static kmem_cache_t *smb_inode_cachep;
@@
-168,7
+167,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
+200,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;
@@
-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 = {