5 files changed, 34 insertions, 5 deletions

diff --git a/fs/nilfs2/Makefile b/fs/nilfs2/Makefile
index 85c98737a146..fc603e0431bb 100644
--- a/fs/nilfs2/Makefile
+++ b/fs/nilfs2/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_NILFS2_FS) += nilfs2.o
 nilfs2-y := inode.o file.o dir.o super.o namei.o page.o mdt.o \
         btnode.o bmap.o btree.o direct.o dat.o recovery.o \
         the_nilfs.o segbuf.o segment.o cpfile.o sufile.o \
-        ifile.o alloc.o gcinode.o ioctl.o
+        ifile.o alloc.o gcinode.o ioctl.o sysfs.o
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
index 9bc72dec3fa6..0696161bf59d 100644
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
@@ -320,6 +320,14 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *);
 int nilfs_init_gcinode(struct inode *inode);
 void nilfs_remove_all_gcinodes(struct the_nilfs *nilfs);
 
+/* sysfs.c */
+int __init nilfs_sysfs_init(void);
+void nilfs_sysfs_exit(void);
+int nilfs_sysfs_create_device_group(struct super_block *);
+void nilfs_sysfs_delete_device_group(struct the_nilfs *);
+int nilfs_sysfs_create_snapshot_group(struct nilfs_root *);
+void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *);
+
 /*
  * Inodes and files operations
  */
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 8c532b2ca3ab..c519927b7b5e 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1452,13 +1452,19 @@ static int __init init_nilfs_fs(void)
         if (err)
                 goto fail;
 
-        err = register_filesystem(&nilfs_fs_type);
+        err = nilfs_sysfs_init();
         if (err)
                 goto free_cachep;
 
+        err = register_filesystem(&nilfs_fs_type);
+        if (err)
+                goto deinit_sysfs_entry;
+
         printk(KERN_INFO "NILFS version 2 loaded\n");
         return 0;
 
+deinit_sysfs_entry:
+        nilfs_sysfs_exit();
 free_cachep:
         nilfs_destroy_cachep();
 fail:
@@ -1468,6 +1474,7 @@ fail:
 static void __exit exit_nilfs_fs(void)
 {
         nilfs_destroy_cachep();
+        nilfs_sysfs_exit();
         unregister_filesystem(&nilfs_fs_type);
 }
 
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index 0f6148c8121a..bbb0dcc35905 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -87,7 +87,7 @@ static struct kobj_type nilfs_##name##_ktype = { \
 };
 
 #define NILFS_DEV_INT_GROUP_FNS(name, parent_name) \
-int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \
+static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \
 { \
         struct kobject *parent; \
         struct kobject *kobj; \
@@ -106,7 +106,7 @@ int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \
                 return err; \
         return 0; \
 } \
-void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \
+static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \
 { \
         kobject_del(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \
 }
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 59d50088b886..9da25fe9ea61 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -98,6 +98,7 @@ void destroy_nilfs(struct the_nilfs *nilfs)
 {
         might_sleep();
         if (nilfs_init(nilfs)) {
+                nilfs_sysfs_delete_device_group(nilfs);
                 brelse(nilfs->ns_sbh[0]);
                 brelse(nilfs->ns_sbh[1]);
         }
@@ -641,6 +642,10 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)
         if (err)
                 goto failed_sbh;
 
+        err = nilfs_sysfs_create_device_group(sb);
+        if (err)
+                goto failed_sbh;
+
         set_nilfs_init(nilfs);
         err = 0;
  out:
@@ -741,12 +746,13 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno)
 {
         struct rb_node **p, *parent;
         struct nilfs_root *root, *new;
+        int err;
 
         root = nilfs_lookup_root(nilfs, cno);
         if (root)
                 return root;
 
-        new = kmalloc(sizeof(*root), GFP_KERNEL);
+        new = kzalloc(sizeof(*root), GFP_KERNEL);
         if (!new)
                 return NULL;
 
@@ -783,6 +789,12 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno)
 
         spin_unlock(&nilfs->ns_cptree_lock);
 
+        err = nilfs_sysfs_create_snapshot_group(new);
+        if (err) {
+                kfree(new);
+                new = NULL;
+        }
+
         return new;
 }
 
@@ -791,6 +803,8 @@ void nilfs_put_root(struct nilfs_root *root)
         if (atomic_dec_and_test(&root->count)) {
                 struct the_nilfs *nilfs = root->nilfs;
 
+                nilfs_sysfs_delete_snapshot_group(root);
+
                 spin_lock(&nilfs->ns_cptree_lock);
                 rb_erase(&root->rb_node, &nilfs->ns_cptree);
                 spin_unlock(&nilfs->ns_cptree_lock);