Skip to contentSkip to conversation

btrfs: Remove all sysfs entries

PATCH Maarten Lankhorst 1 participant 1 message Jun 15, 2011 Btrfs file system

lore
Share & tools
lore

Maarten Lankhorst

author
#0 lore raw

Seems that currently none of the sysfs are created any more, so just remove sysfs support entirely.

Fixes compiling warnings in 3.0rc3

Signed-off-by Maarten Lankhorst <[email protected]>
fs/btrfs/Makefile +1 -1
index 9b72dcf..78fdd86 100644
@@ -4,7 +4,7 @@ obj-$(CONFIG_BTRFS_FS) := btrfs.o
 btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   file-item.o inode-item.o inode-map.o disk-io.o \
 	   transaction.o inode.o file.o tree-defrag.o \
-	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
+	   extent_map.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
 	   export.o tree-log.o acl.o free-space-cache.o zlib.o lzo.o \
 	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o
fs/btrfs/ctree.h +0 -5
index 378b5b4..6aefbb2 100644
@@ -1181,7 +1181,6 @@ struct btrfs_root {
 	struct btrfs_key defrag_max;
 	int defrag_running;
 	char *name;
-	int in_sysfs;
 
 	/* the dirty list is only used by non-reference counted roots */
 	struct list_head dirty_list;

@@ -2604,10 +2603,6 @@ int btrfs_dirty_pages(struct btrfs_root *root, struct inode *inode,
 int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 			struct btrfs_root *root, int cache_only);
 
-/* sysfs.c */
-int btrfs_init_sysfs(void);
-void btrfs_exit_sysfs(void);
-
 /* xattr.c */
 ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
fs/btrfs/disk-io.c +0 -1
index 9f68c68..5df6d8f 100644
@@ -1044,7 +1044,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
 	root->last_trans = 0;
 	root->highest_objectid = 0;
 	root->name = NULL;
-	root->in_sysfs = 0;
 	root->inode_tree = RB_ROOT;
 	INIT_RADIX_TREE(&root->delayed_nodes_tree, GFP_ATOMIC);
 	root->block_rsv = NULL;
fs/btrfs/super.c +1 -8
index 0bb4ebb..02bf74e 100644
@@ -1228,13 +1228,9 @@ static int __init init_btrfs_fs(void)
 {
 	int err;
 
-	err = btrfs_init_sysfs();
-	if (err)
-		return err;
-
 	err = btrfs_init_compress();
 	if (err)
-		goto free_sysfs;
+		return ret;
 
 	err = btrfs_init_cachep();
 	if (err)

@@ -1275,8 +1271,6 @@ free_cachep:
 	btrfs_destroy_cachep();
 free_compress:
 	btrfs_exit_compress();
-free_sysfs:
-	btrfs_exit_sysfs();
 	return err;
 }
 

@@ -1288,7 +1282,6 @@ static void __exit exit_btrfs_fs(void)
 	extent_io_exit();
 	btrfs_interface_exit();
 	unregister_filesystem(&btrfs_fs_type);
-	btrfs_exit_sysfs();
 	btrfs_cleanup_fs_uuids();
 	btrfs_exit_compress();
 }
fs/btrfs/sysfs.c deleted +0 -192

192 lines not on this page · raw message