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

Commit 4d00df54 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: Remove unused ll_rmdir_entry() 



The ioctl for this function was removed, but the function was
forgotten, so kill it now.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17556af2

drivers/staging/lustre/lustre/llite/llite_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -687,7 +687,6 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash, 
int ll_md_blocking_ast(struct ldlm_lock *, struct ldlm_lock_desc *,

		       void *data, int flag);

struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de);

int ll_rmdir_entry(struct inode *dir, char *name, int namelen);



/* llite/rw.c */

int ll_prepare_write(struct file *, struct page *, unsigned from, unsigned to);

drivers/staging/lustre/lustre/llite/namei.c

+0 −28
Original line number Diff line number Diff line
@@ -870,34 +870,6 @@ static inline void ll_get_child_fid(struct dentry *child, struct lu_fid *fid) 
		*fid = *ll_inode2fid(d_inode(child));

}



/**

 * Remove dir entry

 **/

int ll_rmdir_entry(struct inode *dir, char *name, int namelen)

{

	struct ptlrpc_request *request = NULL;

	struct md_op_data *op_data;

	int rc;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p)\n",

	       namelen, name, dir->i_ino, dir->i_generation, dir);



	op_data = ll_prep_md_op_data(NULL, dir, NULL, name, strlen(name),

				     S_IFDIR, LUSTRE_OPC_ANY, NULL);

	if (IS_ERR(op_data))

		return PTR_ERR(op_data);

	op_data->op_cli_flags |= CLI_RM_ENTRY;

	rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);

	ll_finish_md_op_data(op_data);

	if (rc == 0) {

		ll_update_times(request, dir);

		ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_RMDIR, 1);

	}



	ptlrpc_req_finished(request);

	return rc;

}



int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir)

{

	struct mdt_body *body;