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
823813c
..
c361ab4
100644
(file)
--- a/
fs/sysfs/mount.c
+++ b/
fs/sysfs/mount.c
@@
-14,12
+14,21
@@
struct vfsmount *sysfs_mount;
struct super_block * sysfs_sb = NULL;
struct vfsmount *sysfs_mount;
struct super_block * sysfs_sb = NULL;
+struct kmem_cache *sysfs_dir_cachep;
static struct super_operations sysfs_ops = {
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};
static struct super_operations sysfs_ops = {
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};
+static struct sysfs_dirent sysfs_root = {
+ .s_sibling = LIST_HEAD_INIT(sysfs_root.s_sibling),
+ .s_children = LIST_HEAD_INIT(sysfs_root.s_children),
+ .s_element = NULL,
+ .s_type = SYSFS_ROOT,
+ .s_iattr = NULL,
+};
+
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
{
struct inode *inode;
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
{
struct inode *inode;
@@
-29,14
+38,16
@@
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = SYSFS_SUPER_MAGIC;
sb->s_op = &sysfs_ops;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = SYSFS_SUPER_MAGIC;
sb->s_op = &sysfs_ops;
+ sb->s_time_gran = 1;
sysfs_sb = sb;
sysfs_sb = sb;
- inode = sysfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO);
+ inode = sysfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
+ &sysfs_root);
if (inode) {
if (inode) {
- inode->i_op = &s
imple
_dir_inode_operations;
- inode->i_fop = &s
imple
_dir_operations;
+ inode->i_op = &s
ysfs
_dir_inode_operations;
+ inode->i_fop = &s
ysfs
_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
/* 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;
@@
-48,14
+59,15
@@
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
iput(inode);
return -ENOMEM;
}
iput(inode);
return -ENOMEM;
}
+ root->d_fsdata = &sysfs_root;
sb->s_root = root;
return 0;
}
sb->s_root = root;
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 = {
@@
-66,7
+78,13
@@
static struct file_system_type sysfs_fs_type = {
int __init sysfs_init(void)
{
int __init sysfs_init(void)
{
- int err;
+ int err = -ENOMEM;
+
+ sysfs_dir_cachep = kmem_cache_create("sysfs_dir_cache",
+ sizeof(struct sysfs_dirent),
+ 0, 0, NULL, NULL);
+ if (!sysfs_dir_cachep)
+ goto out;
err = register_filesystem(&sysfs_fs_type);
if (!err) {
err = register_filesystem(&sysfs_fs_type);
if (!err) {
@@
-75,7
+93,15
@@
int __init sysfs_init(void)
printk(KERN_ERR "sysfs: could not mount!\n");
err = PTR_ERR(sysfs_mount);
sysfs_mount = NULL;
printk(KERN_ERR "sysfs: could not mount!\n");
err = PTR_ERR(sysfs_mount);
sysfs_mount = NULL;
+ unregister_filesystem(&sysfs_fs_type);
+ goto out_err;
}
}
- }
+ } else
+ goto out_err;
+out:
return err;
return err;
+out_err:
+ kmem_cache_destroy(sysfs_dir_cachep);
+ sysfs_dir_cachep = NULL;
+ goto out;
}
}