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
/
sysfs
/
mount.c
diff --git
a/fs/sysfs/mount.c
b/fs/sysfs/mount.c
index
ea01b08
..
c361ab4
100644
(file)
--- a/
fs/sysfs/mount.c
+++ b/
fs/sysfs/mount.c
@@
-14,7
+14,7
@@
struct vfsmount *sysfs_mount;
struct super_block * sysfs_sb = NULL;
struct vfsmount *sysfs_mount;
struct super_block * sysfs_sb = NULL;
-
kmem_cache_t
*sysfs_dir_cachep;
+
struct kmem_cache
*sysfs_dir_cachep;
static struct super_operations sysfs_ops = {
.statfs = simple_statfs,
static struct super_operations sysfs_ops = {
.statfs = simple_statfs,
@@
-47,7
+47,7
@@
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
inode->i_op = &sysfs_dir_inode_operations;
inode->i_fop = &sysfs_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
inode->i_op = &sysfs_dir_inode_operations;
inode->i_fop = &sysfs_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
- in
ode->i_nlink++;
+ in
c_nlink(inode);
} else {
pr_debug("sysfs: could not get root inode\n");
return -ENOMEM;
} else {
pr_debug("sysfs: could not get root inode\n");
return -ENOMEM;
@@
-64,10
+64,10
@@
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
return 0;
}
return 0;
}
-static
struct super_block *
sysfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static
int
sysfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
- return get_sb_single(fs_type, flags, data, sysfs_fill_super);
+ return get_sb_single(fs_type, flags, data, sysfs_fill_super
, mnt
);
}
static struct file_system_type sysfs_fs_type = {
}
static struct file_system_type sysfs_fs_type = {