From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEFFEC43444 for ; Thu, 10 Jan 2019 17:05:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADFC520685 for ; Thu, 10 Jan 2019 17:05:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IFGiU52x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729058AbfAJRFD (ORCPT ); Thu, 10 Jan 2019 12:05:03 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34943 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729014AbfAJRFC (ORCPT ); Thu, 10 Jan 2019 12:05:02 -0500 Received: by mail-wm1-f66.google.com with SMTP id t200so12889890wmt.0 for ; Thu, 10 Jan 2019 09:05:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7lZDukbCM8gF1GEOUQguVFTtFSDjATbQz/IvDNxJJJ0=; b=IFGiU52xyc23glskrhoWFOMWjUHsxjm4BAvkwF+5xu4XJHd/1woR5bxwkg/qN9qyTy wpqAIzzR4Aif0t7qjjUMdyGpxogvyid/xOWcL+qDSAHfgRcbXt0wMYE888CQihalo/9k nXZA5GraP/XcYSRMHJfdjkEMuaQGu2Yal6EuI2NBrMxfEz9Z4xHtMChAkFvmBRgLdqQq 5Dnlz8/aRfu2zMCPYguimtUtMkC6ANUMNUdkJog4aqH3NI3RanbJ2wEaGgwMeaEj5yfi duq4KRtmtsHC4dOkOBJiPf0T57Z4X26J1yZ6VhE2TqK2frrFBb8AE/ioyMvVjYno0pPI vIYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7lZDukbCM8gF1GEOUQguVFTtFSDjATbQz/IvDNxJJJ0=; b=LyOPxALL2vQ9HJNS+aRzLkayT7fezN5rfz/YKNDxosEoSO+d8aUVPmvkukEDiNfocD O1OzrtKatamD+f8F+OdqaSTrWRSe2uu+Dl7gyTwBzFuM84xtq9ulviWKDOucja7bk89a TYvOY85I+hk3eS0FpRL5wGkIjb7JGDr4aUJDwwfkItkfUeQGkTCOrKXwWprnxPOYkYWy 9GSa22ptckBGp99qmNkp9Rqdj/6GURGu4xl3CMWx4LDnPh2mzvapXZTGh/UiI/GNYXaJ soQJYrGSAUPnXMr9CFmR7YCJBf6rbDbN91RGzsQhCQt7OKhcArMCwVeg8NiqCAgOR/yA pjCw== X-Gm-Message-State: AJcUukcraPprTwpkh1NV1sPQAM1fme20vR5mpszrD1TXVlH9m/owJv5N eZkQOMfjrMofEIoLB4XiNEc= X-Google-Smtp-Source: ALg8bN5tNCFGg+9mURbiPKbQFjxq6KZlZGU7QG9AgJg2SPsj4AGQafiBdamTzVrPYki3s5ppm1ksRg== X-Received: by 2002:a1c:4346:: with SMTP id q67mr11112023wma.114.1547139899725; Thu, 10 Jan 2019 09:04:59 -0800 (PST) Received: from amir-VirtualBox.ctera.local ([188.120.129.201]) by smtp.gmail.com with ESMTPSA id m4sm5725868wmi.3.2019.01.10.09.04.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:04:59 -0800 (PST) From: Amir Goldstein To: Jan Kara Cc: Matthew Bobrowski , linux-fsdevel@vger.kernel.org Subject: [PATCH v5 06/17] fanotify: open code fill_event_metadata() Date: Thu, 10 Jan 2019 19:04:33 +0200 Message-Id: <20190110170444.30616-7-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110170444.30616-1-amir73il@gmail.com> References: <20190110170444.30616-1-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The helper is quite trivial and open coding it will make it easier to implement copying event fid info to user. Signed-off-by: Amir Goldstein --- fs/notify/fanotify/fanotify_user.c | 69 +++++++++++------------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 55cd87b0cc26..2f4901ac090c 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -114,36 +114,6 @@ static int create_fd(struct fsnotify_group *group, return client_fd; } -static int fill_event_metadata(struct fsnotify_group *group, - struct fanotify_event_metadata *metadata, - struct fsnotify_event *fsn_event, - struct file **file) -{ - int ret = 0; - struct fanotify_event *event; - - pr_debug("%s: group=%p metadata=%p event=%p\n", __func__, - group, metadata, fsn_event); - - *file = NULL; - event = container_of(fsn_event, struct fanotify_event, fse); - metadata->event_len = FAN_EVENT_METADATA_LEN; - metadata->metadata_len = FAN_EVENT_METADATA_LEN; - metadata->vers = FANOTIFY_METADATA_VERSION; - metadata->reserved = 0; - metadata->mask = event->mask & FANOTIFY_OUTGOING_EVENTS; - metadata->pid = pid_vnr(event->pid); - if (unlikely(event->mask & FAN_Q_OVERFLOW)) - metadata->fd = FAN_NOFD; - else { - metadata->fd = create_fd(group, event, file); - if (metadata->fd < 0) - ret = metadata->fd; - } - - return ret; -} - static struct fanotify_perm_event *dequeue_event( struct fsnotify_group *group, int fd) { @@ -205,37 +175,50 @@ static int process_access_response(struct fsnotify_group *group, } static ssize_t copy_event_to_user(struct fsnotify_group *group, - struct fsnotify_event *event, + struct fsnotify_event *fsn_event, char __user *buf, size_t count) { - struct fanotify_event_metadata fanotify_event_metadata; + struct fanotify_event_metadata metadata; + struct fanotify_event *event; struct file *f; int fd, ret; - pr_debug("%s: group=%p event=%p\n", __func__, group, event); + pr_debug("%s: group=%p event=%p\n", __func__, group, fsn_event); - ret = fill_event_metadata(group, &fanotify_event_metadata, event, &f); - if (ret < 0) - return ret; + event = container_of(fsn_event, struct fanotify_event, fse); + metadata.event_len = FAN_EVENT_METADATA_LEN; + metadata.metadata_len = FAN_EVENT_METADATA_LEN; + metadata.vers = FANOTIFY_METADATA_VERSION; + metadata.reserved = 0; + metadata.mask = event->mask & FANOTIFY_OUTGOING_EVENTS; + metadata.pid = pid_vnr(event->pid); + + if (unlikely(event->mask & FAN_Q_OVERFLOW)) { + fd = FAN_NOFD; + } else { + fd = create_fd(group, event, &f); + if (fd < 0) + return fd; + } + metadata.fd = fd; - fd = fanotify_event_metadata.fd; ret = -EFAULT; /* * Sanity check copy size in case get_one_event() and * fill_event_metadata() event_len sizes ever get out of sync. */ - if (WARN_ON_ONCE(fanotify_event_metadata.event_len > count)) + if (WARN_ON_ONCE(metadata.event_len > count)) goto out_close_fd; - if (copy_to_user(buf, &fanotify_event_metadata, - fanotify_event_metadata.event_len)) + + if (copy_to_user(buf, &metadata, metadata.event_len)) goto out_close_fd; - if (fanotify_is_perm_event(FANOTIFY_E(event)->mask)) - FANOTIFY_PE(event)->fd = fd; + if (fanotify_is_perm_event(event->mask)) + FANOTIFY_PE(fsn_event)->fd = fd; if (fd != FAN_NOFD) fd_install(fd, f); - return fanotify_event_metadata.event_len; + return metadata.event_len; out_close_fd: if (fd != FAN_NOFD) { -- 2.17.1