[2.6 patch] fs/configfs/ cleanups

[Adrian Bunk]

On Wed, Feb 27, 2008 at 02:36:30PM -0800, Joel Becker wrote:
> On Wed, Feb 27, 2008 at 11:20:48PM +0200, Adrian Bunk wrote:
> > This patch contains the following cleanups:
> > - make the needlessly global file.c:configfs_add_file() static
> > - #if 0 the unused inode.c:configfs_hash_and_remove()
> > 
> > Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>
> Acked-by: Joel Becker <joel.becker@xxxxxxxxxx>
> 
> I'd also take a patch to remove configfs_hash_and_remove().

Patch below.

> Joel

cu
Adrian


<--  snip  -->


This patch contains the following cleanups:
- make the needlessly global file.c:configfs_add_file() static
- remove the unused inode.c:configfs_hash_and_remove()

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>

---

 fs/configfs/configfs_internal.h |    3 ---
 fs/configfs/file.c              |    3 ++-
 fs/configfs/inode.c             |   23 -----------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

927a9da2f7bae91593a5735477c2605f34872302 foobar
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index cca9860..378fa36 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -63,9 +63,6 @@ extern int configfs_create_file(struct config_item *, const struct configfs_attr
 extern int configfs_make_dirent(struct configfs_dirent *,
 				struct dentry *, void *, umode_t, int);
 
-extern int configfs_add_file(struct dentry *, const struct configfs_attribute *, int);
-extern void configfs_hash_and_remove(struct dentry * dir, const char * name);
-
 extern const unsigned char * configfs_get_name(struct configfs_dirent *sd);
 extern void configfs_drop_dentry(struct configfs_dirent *sd, struct dentry *parent);
 extern int configfs_setattr(struct dentry *dentry, struct iattr *iattr);
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 397cb50..f331a40 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -314,7 +314,8 @@ const struct file_operations configfs_file_operations = {
 };
 
 
-int configfs_add_file(struct dentry * dir, const struct configfs_attribute * attr, int type)
+static int configfs_add_file(struct dentry * dir,
+			     const struct configfs_attribute * attr, int type)
 {
 	struct configfs_dirent * parent_sd = dir->d_fsdata;
 	umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index 4c1ebff..c655024 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -233,29 +233,6 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)
 	}
 }
 
-void configfs_hash_and_remove(struct dentry * dir, const char * name)
-{
-	struct configfs_dirent * sd;
-	struct configfs_dirent * parent_sd = dir->d_fsdata;
-
-	if (dir->d_inode == NULL)
-		/* no inode means this hasn't been made visible yet */
-		return;
-
-	mutex_lock(&dir->d_inode->i_mutex);
-	list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
-		if (!sd->s_element)
-			continue;
-		if (!strcmp(configfs_get_name(sd), name)) {
-			list_del_init(&sd->s_sibling);
-			configfs_drop_dentry(sd, dir);
-			configfs_put(sd);
-			break;
-		}
-	}
-	mutex_unlock(&dir->d_inode->i_mutex);
-}
-
 int __init configfs_inode_init(void)
 {
 	return bdi_init(&configfs_backing_dev_info);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/