Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f45f1a7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] remove duplicate get_dentry functions in various places 



Various filesystem drivers have grown a get_dentry() function that's a
duplicate of lookup_one_len, except that it doesn't take a maximum length
argument and doesn't check for \0 or / in the passed in filename.

Switch all these places to use lookup_one_len.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Greg KH <greg@kroah.com>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac20427e

drivers/usb/core/inode.c

+1 −12
Original line number Diff line number Diff line
@@ -453,17 +453,6 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent) 
	return 0;

}



static struct dentry * 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);

}               





/*

 * fs_create_by_name - create a file, given a name

 * @name:	name of file
@@ -496,7 +485,7 @@ static int fs_create_by_name (const char *name, mode_t mode, 


	*dentry = NULL;

	down(&parent->d_inode->i_sem);

	*dentry = get_dentry (parent, name);

	*dentry = lookup_one_len(name, parent, strlen(name));

	if (!IS_ERR(dentry)) {

		if ((mode & S_IFMT) == S_IFDIR)

			error = usbfs_mkdir (parent->d_inode, *dentry, mode);

fs/debugfs/inode.c

+1 −11
Original line number Diff line number Diff line
@@ -110,16 +110,6 @@ static int debug_fill_super(struct super_block *sb, void *data, int silent) 
	return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);

}



static struct dentry * 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);

}               



static struct super_block *debug_get_sb(struct file_system_type *fs_type,

				        int flags, const char *dev_name,

					void *data)
@@ -157,7 +147,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode, 


	*dentry = NULL;

	down(&parent->d_inode->i_sem);

	*dentry = get_dentry (parent, name);

	*dentry = lookup_one_len(name, parent, strlen(name));

	if (!IS_ERR(dentry)) {

		if ((mode & S_IFMT) == S_IFDIR)

			error = debugfs_mkdir(parent->d_inode, *dentry, mode);

fs/sysfs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/mount.h>

#include <linux/module.h>

#include <linux/kobject.h>

#include <linux/namei.h>

#include "sysfs.h"



DECLARE_RWSEM(sysfs_rename_sem);
@@ -99,7 +100,7 @@ static int create_dir(struct kobject * k, struct dentry * p, 
	umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;



	down(&p->d_inode->i_sem);

	*d = sysfs_get_dentry(p,n);

	*d = lookup_one_len(n, p, strlen(n));

	if (!IS_ERR(*d)) {

		error = sysfs_make_dirent(p->d_fsdata, *d, k, mode, SYSFS_DIR);

		if (!error) {
@@ -315,7 +316,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name) 


	down(&parent->d_inode->i_sem);



	new_dentry = sysfs_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 = kobject_set_name(kobj, "%s", new_name);

fs/sysfs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/module.h>

#include <linux/dnotify.h>

#include <linux/kobject.h>

#include <linux/namei.h>

#include <asm/uaccess.h>

#include <asm/semaphore.h>
@@ -400,7 +401,7 @@ int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) 
	int res = -ENOENT;



	down(&dir->d_inode->i_sem);

	victim = sysfs_get_dentry(dir, attr->name);

	victim = lookup_one_len(attr->name, dir, strlen(attr->name));

	if (!IS_ERR(victim)) {

		/* make sure dentry is really there */

		if (victim->d_inode &&
@@ -443,7 +444,7 @@ int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode) 
	int res = -ENOENT;



	down(&dir->d_inode->i_sem);

	victim = sysfs_get_dentry(dir, attr->name);

	victim = lookup_one_len(attr->name, dir, strlen(attr->name));

	if (!IS_ERR(victim)) {

		if (victim->d_inode &&

		    (victim->d_parent->d_inode == dir->d_inode)) {

fs/sysfs/group.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kobject.h>

#include <linux/module.h>

#include <linux/dcache.h>

#include <linux/namei.h>

#include <linux/err.h>

#include "sysfs.h"
@@ -68,7 +69,8 @@ void sysfs_remove_group(struct kobject * kobj, 
	struct dentry * dir;



	if (grp->name)

		dir = sysfs_get_dentry(kobj->dentry,grp->name);

		dir = lookup_one_len(grp->name, kobj->dentry,

				strlen(grp->name));

	else

		dir = dget(kobj->dentry);