Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752465AbbKGHrU (ORCPT ); Sat, 7 Nov 2015 02:47:20 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33128 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751797AbbKGHrT (ORCPT ); Sat, 7 Nov 2015 02:47:19 -0500 From: Shivani Bhardwaj To: gregkh@linuxfoundation.org Cc: oleg.drokin@intel.com, andreas.dilger@intel.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] Staging: lustre: llite_lib: Remove wrapper function Date: Sat, 7 Nov 2015 13:16:26 +0530 Message-Id: <2f66e94923a7655495165123a5efe3bd099d77bc.1446881645.git.shivanib134@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2238 Lines: 68 Remove the function ll_finish_md_op_data() and replace all its calls with the standrd function ll_finish_md_op_data(). Signed-off-by: Shivani Bhardwaj --- drivers/staging/lustre/lustre/llite/llite_lib.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 4a8c759..143be87 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1355,7 +1355,7 @@ out: if (!rc) rc = rc1; } - ll_finish_md_op_data(op_data); + kfree(op_data); if (!S_ISDIR(inode->i_mode)) { mutex_lock(&inode->i_mutex); @@ -1732,7 +1732,7 @@ int ll_iocontrol(struct inode *inode, struct file *file, op_data->op_valid = OBD_MD_FLFLAGS; rc = md_getattr(sbi->ll_md_exp, op_data, &req); - ll_finish_md_op_data(op_data); + kfree(op_data); if (rc) { CERROR("failure %d inode %lu\n", rc, inode->i_ino); return -abs(rc); @@ -1763,7 +1763,7 @@ int ll_iocontrol(struct inode *inode, struct file *file, op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG; rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, NULL, 0, &req, NULL); - ll_finish_md_op_data(op_data); + kfree(op_data); ptlrpc_req_finished(req); if (rc) return rc; @@ -1934,7 +1934,7 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req) op_data->op_mod_time = get_seconds(); md_close(exp, op_data, NULL, &close_req); ptlrpc_req_finished(close_req); - ll_finish_md_op_data(op_data); + kfree(op_data); } int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req, @@ -2170,11 +2170,6 @@ struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data, return op_data; } -void ll_finish_md_op_data(struct md_op_data *op_data) -{ - kfree(op_data); -} - int ll_show_options(struct seq_file *seq, struct dentry *dentry) { struct ll_sb_info *sbi; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/