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

Commit b26d4cd3 authored by Al Viro's avatar Al Viro
Browse files

consolidate simple ->d_delete() instances 



Rename simple_delete_dentry() to always_delete_dentry() and export it.
Export simple_dentry_operations, while we are at it, and get rid of
their duplicates

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 951b4bd5

arch/ia64/kernel/perfmon.c

+1 −7
Original line number Diff line number Diff line
@@ -2166,12 +2166,6 @@ static const struct file_operations pfm_file_ops = { 
	.flush		= pfm_flush

};



static int

pfmfs_delete_dentry(const struct dentry *dentry)

{

	return 1;

}



static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen)

{

	return dynamic_dname(dentry, buffer, buflen, "pfm:[%lu]",
@@ -2179,7 +2173,7 @@ static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen) 
}



static const struct dentry_operations pfmfs_dentry_operations = {

	.d_delete = pfmfs_delete_dentry,

	.d_delete = always_delete_dentry,

	.d_dname = pfmfs_dname,

};

fs/9p/vfs_dentry.c

+1 −18
Original line number Diff line number Diff line
@@ -42,23 +42,6 @@ 
#include "v9fs_vfs.h"

#include "fid.h"



/**

 * v9fs_dentry_delete - called when dentry refcount equals 0

 * @dentry:  dentry in question

 *

 * By returning 1 here we should remove cacheing of unused

 * dentry components.

 *

 */



static int v9fs_dentry_delete(const struct dentry *dentry)

{

	p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",

		 dentry->d_name.name, dentry);



	return 1;

}



/**

 * v9fs_cached_dentry_delete - called when dentry refcount equals 0

 * @dentry:  dentry in question
@@ -134,6 +117,6 @@ const struct dentry_operations v9fs_cached_dentry_operations = { 
};



const struct dentry_operations v9fs_dentry_operations = {

	.d_delete = v9fs_dentry_delete,

	.d_delete = always_delete_dentry,

	.d_release = v9fs_dentry_release,

};

fs/configfs/dir.c

+1 −11
Original line number Diff line number Diff line
@@ -66,19 +66,9 @@ static void configfs_d_iput(struct dentry * dentry, 
	iput(inode);

}



/*

 * We _must_ delete our dentries on last dput, as the chain-to-parent

 * behavior is required to clear the parents of default_groups.

 */

static int configfs_d_delete(const struct dentry *dentry)

{

	return 1;

}



const struct dentry_operations configfs_dentry_ops = {

	.d_iput		= configfs_d_iput,

	/* simple_delete_dentry() isn't exported */

	.d_delete	= configfs_d_delete,

	.d_delete	= always_delete_dentry,

};



#ifdef CONFIG_LOCKDEP

fs/efivarfs/super.c

+1 −10
Original line number Diff line number Diff line
@@ -83,19 +83,10 @@ static int efivarfs_d_hash(const struct dentry *dentry, struct qstr *qstr) 
	return 0;

}



/*

 * Retaining negative dentries for an in-memory filesystem just wastes

 * memory and lookup time: arrange for them to be deleted immediately.

 */

static int efivarfs_delete_dentry(const struct dentry *dentry)

{

	return 1;

}



static struct dentry_operations efivarfs_d_ops = {

	.d_compare = efivarfs_d_compare,

	.d_hash = efivarfs_d_hash,

	.d_delete = efivarfs_delete_dentry,

	.d_delete = always_delete_dentry,

};



static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name)

fs/hostfs/hostfs_kern.c

+1 −10
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode) 


#define FILE_HOSTFS_I(file) HOSTFS_I(file_inode(file))



static int hostfs_d_delete(const struct dentry *dentry)

{

	return 1;

}



static const struct dentry_operations hostfs_dentry_ops = {

	.d_delete		= hostfs_d_delete,

};



/* Changed in hostfs_args before the kernel starts running */

static char *root_ino = "";

static int append = 0;
@@ -925,7 +916,7 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) 
	sb->s_blocksize_bits = 10;

	sb->s_magic = HOSTFS_SUPER_MAGIC;

	sb->s_op = &hostfs_sbops;

	sb->s_d_op = &hostfs_dentry_ops;

	sb->s_d_op = &simple_dentry_operations;

	sb->s_maxbytes = MAX_LFS_FILESIZE;



	/* NULL is printed as <NULL> by sprintf: avoid that. */