From patchwork Thu Jun 10 00:21:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Bobrowski X-Patchwork-Id: 12311503 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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 66D53C48BD1 for ; Thu, 10 Jun 2021 00:22:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5245C613EC for ; Thu, 10 Jun 2021 00:22:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230232AbhFJAYa (ORCPT ); Wed, 9 Jun 2021 20:24:30 -0400 Received: from mail-pj1-f42.google.com ([209.85.216.42]:36840 "EHLO mail-pj1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229659AbhFJAY1 (ORCPT ); Wed, 9 Jun 2021 20:24:27 -0400 Received: by mail-pj1-f42.google.com with SMTP id d5-20020a17090ab305b02901675357c371so2669973pjr.1 for ; Wed, 09 Jun 2021 17:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=9XM72zD0z0Xv0rMHyaHFP495n4l5kcvzJAmEfdgpKZs=; b=r69a7dK48SfE/AuNUC3ncvxS/ezeS+XV31Udl98vgJM0OIxgguKnDzxmFBRGAWhVeL 8zFPVlO+FbcN8D7+oLFKxV+kBBAw/ADFnJtlhnvvKo5F0hLSDL2uzfoF/jxe8J0OGLaj YEU8XovYPMmuQGOvZphjuc1k0xVo4KwabpmJluF9UhnuMh6m8X7d/iupPpZMDI/oJW3g L1xc/SWQxJI5EGKBm8K4EH5C87cDTj3EzEVeSN5M+MJW+jlpM1Y7gPW6arG5/0fk6YoB ciMXbngv4V2hHY8Emfq7pnACLsOsRDfkVyP5PUHPWhq8bazB2kRArs1YqnIEEbPnEHgF fCJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9XM72zD0z0Xv0rMHyaHFP495n4l5kcvzJAmEfdgpKZs=; b=lBOF1q2bHWpyo9As757uiRxqYZMG1JasuZBhEAX4haoDtX0cv0tnhJhldd8siZC9VH WqYNhR2v47//Pc2vbdePfIrgK+4JnaGnpiu+g8eCYv5REgprO/BikpadtqS729EOCvyX r1nfR0VSXs/fPBED2nB1+QLSKGcqw8n4hSR+DLGi2Mx180Ehste6RE1OduCW0zRxiw4l cCcAd0gmUcRSjGqaE1xZcTpnLrnDDvfAQ1C6uMeAndlDGPNqTvukIT5bF9krc7xNinb6 4B+cSBYe/8Xeof1IeMYb7b6O1GzaC8mtq05UVFo+7znovIR4FZeDwd4kysIzuWP4EmKO Sv8A== X-Gm-Message-State: AOAM531wcWeUAp1K5Kwu3WpWr4/o5DjRTWTzj3+/P07ulVeluGOELw4o uorLWsh1VnsdizvKOZ+zCxk3qA== X-Google-Smtp-Source: ABdhPJxQCsARBOCqNzcDxVCfUX8XXLDM9dtBMmYlloJi8aoBFru2oT+aUDuaaJCZwG41p88BEwu+ew== X-Received: by 2002:a17:90a:8581:: with SMTP id m1mr350223pjn.47.1623284478922; Wed, 09 Jun 2021 17:21:18 -0700 (PDT) Received: from google.com ([2401:fa00:9:211:6512:d64a:3615:dcbf]) by smtp.gmail.com with ESMTPSA id v18sm607993pff.90.2021.06.09.17.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 17:21:18 -0700 (PDT) Date: Thu, 10 Jun 2021 10:21:07 +1000 From: Matthew Bobrowski To: jack@suse.cz, amir73il@gmail.com, christian.brauner@ubuntu.com Cc: linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH v2 3/5] fanotify/fanotify_user.c: minor cosmetic adjustments to fid labels Message-ID: <718053d928066d8932065433c6f1a7120f82f903.1623282854.git.repnop@google.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org With the idea to support additional info record types in the future i.e. fanotify_event_info_pidfd, it's a good idea to rename some of the labels assigned to some of the existing fid related functions, parameters, etc which more accurately represent the intent behind their usage. For example, copy_info_to_user() was defined with a generic function label, which arguably reads as being supportive of different info record types, however the parameter list for this function is explicitly tailored towards the creation and copying of the fanotify_event_info_fid records. This same point applies to the macro defined as FANOTIFY_INFO_HDR_LEN. With fanotify_event_info_len(), we change the parameter label so that the function implies that it can be extended to calculate the length for additional info record types. Signed-off-by: Matthew Bobrowski --- fs/notify/fanotify/fanotify_user.c | 33 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index be5b6d2c01e7..6223ffd0e4db 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -104,7 +104,7 @@ struct kmem_cache *fanotify_path_event_cachep __read_mostly; struct kmem_cache *fanotify_perm_event_cachep __read_mostly; #define FANOTIFY_EVENT_ALIGN 4 -#define FANOTIFY_INFO_HDR_LEN \ +#define FANOTIFY_FID_INFO_HDR_LEN \ (sizeof(struct fanotify_event_info_fid) + sizeof(struct file_handle)) static int fanotify_fid_info_len(int fh_len, int name_len) @@ -114,10 +114,11 @@ static int fanotify_fid_info_len(int fh_len, int name_len) if (name_len) info_len += name_len + 1; - return roundup(FANOTIFY_INFO_HDR_LEN + info_len, FANOTIFY_EVENT_ALIGN); + return roundup(FANOTIFY_FID_INFO_HDR_LEN + info_len, + FANOTIFY_EVENT_ALIGN); } -static int fanotify_event_info_len(unsigned int fid_mode, +static int fanotify_event_info_len(unsigned int info_mode, struct fanotify_event *event) { struct fanotify_info *info = fanotify_event_info(event); @@ -128,7 +129,8 @@ static int fanotify_event_info_len(unsigned int fid_mode, if (dir_fh_len) { info_len += fanotify_fid_info_len(dir_fh_len, info->name_len); - } else if ((fid_mode & FAN_REPORT_NAME) && (event->mask & FAN_ONDIR)) { + } else if ((info_mode & FAN_REPORT_NAME) && + (event->mask & FAN_ONDIR)) { /* * With group flag FAN_REPORT_NAME, if name was not recorded in * event on a directory, we will report the name ".". @@ -303,9 +305,10 @@ static int process_access_response(struct fsnotify_group *group, return -ENOENT; } -static int copy_info_to_user(__kernel_fsid_t *fsid, struct fanotify_fh *fh, - int info_type, const char *name, size_t name_len, - char __user *buf, size_t count) +static int copy_fid_info_to_user(__kernel_fsid_t *fsid, struct fanotify_fh *fh, + int info_type, const char *name, + size_t name_len, + char __user *buf, size_t count) { struct fanotify_event_info_fid info = { }; struct file_handle handle = { }; @@ -466,10 +469,11 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, if (fanotify_event_dir_fh_len(event)) { info_type = info->name_len ? FAN_EVENT_INFO_TYPE_DFID_NAME : FAN_EVENT_INFO_TYPE_DFID; - ret = copy_info_to_user(fanotify_event_fsid(event), - fanotify_info_dir_fh(info), - info_type, fanotify_info_name(info), - info->name_len, buf, count); + ret = copy_fid_info_to_user(fanotify_event_fsid(event), + fanotify_info_dir_fh(info), + info_type, + fanotify_info_name(info), + info->name_len, buf, count); if (ret < 0) return ret; @@ -515,9 +519,10 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, info_type = FAN_EVENT_INFO_TYPE_FID; } - ret = copy_info_to_user(fanotify_event_fsid(event), - fanotify_event_object_fh(event), - info_type, dot, dot_len, buf, count); + ret = copy_fid_info_to_user(fanotify_event_fsid(event), + fanotify_event_object_fh(event), + info_type, dot, dot_len, + buf, count); if (ret < 0) return ret;