[Ocfs2-commits] mfasheh commits r2445 - trunk/fs/configfs

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-06-29 16:14:40 -0500 (Wed, 29 Jun 2005)
New Revision: 2445

Modified:
   trunk/fs/configfs/configfs_internal.h
   trunk/fs/configfs/dir.c
   trunk/fs/configfs/inode.c
Log:
* merge a patch from Christoph Hellwig <hch at infradead.org>
  - slight cleanup by myself

Signed-off-by: jlbec



Modified: trunk/fs/configfs/configfs_internal.h
===================================================================
--- trunk/fs/configfs/configfs_internal.h	2005-06-28 22:50:18 UTC (rev 2444)
+++ trunk/fs/configfs/configfs_internal.h	2005-06-29 21:14:40 UTC (rev 2445)
@@ -57,7 +57,6 @@
 extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
 extern int configfs_make_dirent(struct configfs_dirent *,
 				struct dentry *, void *, umode_t, int);
-extern struct dentry * configfs_get_dentry(struct dentry *, const char *);
 
 extern int configfs_add_file(struct dentry *, const struct configfs_attribute *, int);
 extern void configfs_hash_and_remove(struct dentry * dir, const char * name);

Modified: trunk/fs/configfs/dir.c
===================================================================
--- trunk/fs/configfs/dir.c	2005-06-28 22:50:18 UTC (rev 2444)
+++ trunk/fs/configfs/dir.c	2005-06-29 21:14:40 UTC (rev 2445)
@@ -858,7 +858,7 @@
 
 	down(&parent->d_inode->i_sem);
 
-	new_dentry = configfs_get_dentry(parent, new_name);
+	new_dentry = lookup_one_len(new_name, parent, strlen(new_name));
 	if (!IS_ERR(new_dentry)) {
   		if (!new_dentry->d_inode) {
 			error = config_item_set_name(item, "%s", new_name);

Modified: trunk/fs/configfs/inode.c
===================================================================
--- trunk/fs/configfs/inode.c	2005-06-28 22:50:18 UTC (rev 2444)
+++ trunk/fs/configfs/inode.c	2005-06-29 21:14:40 UTC (rev 2445)
@@ -102,16 +102,6 @@
 	return error;
 }
 
-struct dentry * configfs_get_dentry(struct dentry * parent, const char * name)
-{
-	struct qstr qstr;
-
-	qstr.name = name;
-	qstr.len = strlen(name);
-	qstr.hash = full_name_hash(name,qstr.len);
-	return lookup_hash(&qstr,parent);
-}
-
 /*
  * Get the name for corresponding element represented by the given configfs_dirent
  */