From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id F2F0D9A97 for ; Thu, 2 Apr 2015 19:01:42 +0200 (CEST) Received: by wgdm6 with SMTP id m6so91475986wgd.2 for ; Thu, 02 Apr 2015 10:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=3ynCrnumLpeleBlE/C0+GKUmXdHNeg0kJoPBlRDpoMQ=; b=NkKeYxT2wF3V+Io05RhpNiaX0q3jPFGJslyz1No5jTlsTCBkCmHNcUOkrei6ticjir yo2Lpc4Ngh6I8UYQ30yZjlRJBRiOwas18/6S2uOuHtgOZ9I4X9aR/1K/whaXXle74Hz5 ixM0VJ0E4dYH1KZLcSMGEcILHNAl6dGnhQ2Xo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3ynCrnumLpeleBlE/C0+GKUmXdHNeg0kJoPBlRDpoMQ=; b=NN5PgggyceNcDUOd5VgXhAw7O33NTBb9ekGjC1pe3EEXlp0Od6fYmu5M0mtqvWvB1M 23dfDpWzEn3Y0Lx8RiYosjPOUo80IJJSPSiho80svZuYfcMsqIWQ0/a1zsGbTvuHp9Vb FDePEgz5OEFyeOB6ImEpuvk1kkQycZdm3VKJD0/PIuRXImzBCh+cBBje9utNLSunTkMW 1X2zPUexrVBq0cLaqyNmaSV22Q3HcLKXJoSxrkob88L/WlzTZSUFqzGbwIqks0yoTHST XD+ziNbvdiLp2CD56Fw4xO0e9JlYBcyAdZ9fXt78tmPs+gdNp58QQzN974SckK1xqxek M+Uw== X-Gm-Message-State: ALoCoQkxuugfaGAcrpFr6adEQKvanhZXwgVSVFZMef0hj8BJVGVlE9xT0UyU7BnKZXFFsFu9ONk8 X-Received: by 10.181.13.170 with SMTP id ez10mr10459123wid.72.1427994102901; Thu, 02 Apr 2015 10:01:42 -0700 (PDT) Received: from pboldin-pc.kha.mirantis.net ([194.213.110.67]) by mx.google.com with ESMTPSA id md2sm30801242wic.19.2015.04.02.10.01.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Apr 2015 10:01:42 -0700 (PDT) From: Pavel Boldin To: dev@dpdk.org Date: Thu, 2 Apr 2015 20:01:19 +0300 Message-Id: <1427994080-10163-5-git-send-email-pboldin@mirantis.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427994080-10163-1-git-send-email-pboldin@mirantis.com> References: <1427123731-15654-1-git-send-email-pboldin@mirantis.com> <1427994080-10163-1-git-send-email-pboldin@mirantis.com> Subject: [dpdk-dev] [PATCH v4 4/5] vhost: eventfd_link: replace copy-pasted sys_close X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2015 17:01:43 -0000 Replace copy-pasted `fget_from_files' -> `filp_close' with a `sys_close' call. --- lib/librte_vhost/eventfd_link/eventfd_link.c | 49 +++++++--------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/lib/librte_vhost/eventfd_link/eventfd_link.c b/lib/librte_vhost/eventfd_link/eventfd_link.c index 0a06594..9bc52a3 100644 --- a/lib/librte_vhost/eventfd_link/eventfd_link.c +++ b/lib/librte_vhost/eventfd_link/eventfd_link.c @@ -88,9 +88,8 @@ eventfd_link_ioctl_copy(unsigned long arg) { void __user *argp = (void __user *) arg; struct task_struct *task_target = NULL; - struct file *file; - struct files_struct *files; - struct fdtable *fdt; + struct file *target_file; + struct files_struct *target_files; struct eventfd_copy eventfd_copy; long ret = -EFAULT; @@ -109,51 +108,27 @@ eventfd_link_ioctl_copy(unsigned long arg) goto out; } - ret = -ESTALE; - files = get_files_struct(current); - if (files == NULL) { - pr_info("Failed to get current files struct\n"); - goto out_task; - } - - ret = -EBADF; - file = fget_from_files(files, eventfd_copy.source_fd); - - if (file == NULL) { - pr_info("Failed to get fd %d from source\n", - eventfd_copy.source_fd); - put_files_struct(files); + /* Closing the source_fd */ + ret = sys_close(eventfd_copy.source_fd); + if (ret) goto out_task; - } - - /* - * Release the existing eventfd in the source process - */ - spin_lock(&files->file_lock); - fput(file); - filp_close(file, files); - fdt = files_fdtable(files); - fdt->fd[eventfd_copy.source_fd] = NULL; - spin_unlock(&files->file_lock); - - put_files_struct(files); + ret = -ESTALE; /* * Find the file struct associated with the target fd. */ - ret = -ESTALE; - files = get_files_struct(task_target); - if (files == NULL) { + target_files = get_files_struct(task_target); + if (target_files == NULL) { pr_info("Failed to get target files struct\n"); goto out_task; } ret = -EBADF; - file = fget_from_files(files, eventfd_copy.target_fd); - put_files_struct(files); + target_file = fget_from_files(target_files, eventfd_copy.target_fd); + put_files_struct(target_files); - if (file == NULL) { + if (target_file == NULL) { pr_info("Failed to get fd %d from target\n", eventfd_copy.target_fd); goto out_task; @@ -164,7 +139,7 @@ eventfd_link_ioctl_copy(unsigned long arg) * file desciptor of the source process, */ - fd_install(eventfd_copy.source_fd, file); + fd_install(eventfd_copy.source_fd, target_file); ret = 0; out_task: -- 1.9.1