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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
sysfs
/
mount.c
diff --git
a/fs/sysfs/mount.c
b/fs/sysfs/mount.c
index
1fe30ee
..
ea01b08
100644
(file)
--- a/
fs/sysfs/mount.c
+++ b/
fs/sysfs/mount.c
@@
-26,6
+26,7
@@
static struct sysfs_dirent sysfs_root = {
.s_children = LIST_HEAD_INIT(sysfs_root.s_children),
.s_element = NULL,
.s_type = SYSFS_ROOT,
.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)
};
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
@@
-40,7
+41,8
@@
static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_time_gran = 1;
sysfs_sb = sb;
sb->s_time_gran = 1;
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) {
inode->i_op = &sysfs_dir_inode_operations;
inode->i_fop = &sysfs_dir_operations;
if (inode) {
inode->i_op = &sysfs_dir_inode_operations;
inode->i_fop = &sysfs_dir_operations;
@@
-91,6
+93,7
@@
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;
}
} else
@@
-99,5
+102,6
@@
out:
return err;
out_err:
kmem_cache_destroy(sysfs_dir_cachep);
return err;
out_err:
kmem_cache_destroy(sysfs_dir_cachep);
+ sysfs_dir_cachep = NULL;
goto out;
}
goto out;
}