From patchwork Wed Nov 13 00:56:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1193924 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dGUxN6Iw"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47CR5b2pfYz9sPk for ; Wed, 13 Nov 2019 11:56:48 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8E3383C2489 for ; Wed, 13 Nov 2019 01:56:42 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 443043C2451 for ; Wed, 13 Nov 2019 01:56:38 +0100 (CET) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 6BDA560107E for ; Wed, 13 Nov 2019 01:56:38 +0100 (CET) Received: by mail-wr1-x444.google.com with SMTP id l7so334452wrp.6 for ; Tue, 12 Nov 2019 16:56:38 -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 :mime-version:content-transfer-encoding; bh=Dc/xQOuLU+XjhfcGqQssYC0pfzQMyExxMgegNwxz1/Y=; b=dGUxN6IwzB0/771EAn4yOrTyIj5HoCRcL4+ek3dpqpWQYTZKXtMdYtZ4XlwCdg7hbe 0HV/y2V2WB/IpzH67YGfsF3vxwW2d1yLQwEQ7o59htALXZvFeG/5EjMUH3Kltf0ghgzT 8Hkg3Zh/yiP14SXPX5em+Di25NbYAkmg+Iasl/FryDsw3cG9s4mDtJeVv6igCRGSupCH 6oL6cCj0bydJ8zAUkZ05OtsYQJ3nuZFCch4nhtzlXm5wCq94nhrsXFmuWanuoV56JCWB GaVfSQ/8tzz1tvQI8hsf8ND4DmOUbhF25J/YRrXJvVd+Y9DubUtcRQKUbRlwa2lmHV49 xZuw== 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:mime-version:content-transfer-encoding; bh=Dc/xQOuLU+XjhfcGqQssYC0pfzQMyExxMgegNwxz1/Y=; b=LuneEKQSc2CnSt6I9Enq5u345HaYhUqfYaznP2VUiAxrk5l5IidAMHqbp7ZU3Jez5k ONVk76k8yxKma3mY7rP9hSuAdiCPMMpfoRA1dSC7BCXxKz1b+nzX3boQIdUfCRZomvQp J6RFiNmF/l7KVjebX347BMMD8RPqv9+h23MMrQrolm5jZtwouSkYDHNil4sNgbk0xLgQ zs3TmVBThBoQvTPwN4AXB14xafcXxBSHUPshVPomUkiO0SKzEj+CfnL44Ka15NWqqwfT kkjjCvbYT5BvmhzdCgBARGONTLjZ5BVIh4IXbL0sc+cDixzHBpqkiFOaMN+xr0usk0fw AHTw== X-Gm-Message-State: APjAAAXVZ2PpSTTnKRaeV5C9IkCVXiAoyjtclhQu85xlxugSRCpi61Cs GG0Gmsxr9WupW/RyZhxmauor+2vJ X-Google-Smtp-Source: APXvYqz5PyHVAwu35aaMVVyZqOKedteh8Q/vCVParo9qcGfOfR+WL23zw+BOKVARWKjzxRdUHVS1NQ== X-Received: by 2002:a5d:6746:: with SMTP id l6mr121287wrw.349.1573606597610; Tue, 12 Nov 2019 16:56:37 -0800 (PST) Received: from x230.suse.cz ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id z4sm431546wmf.36.2019.11.12.16.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 16:56:36 -0800 (PST) From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 13 Nov 2019 01:56:24 +0100 Message-Id: <20191113005626.19585-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191113005626.19585-1-petr.vorel@gmail.com> References: <20191113005626.19585-1-petr.vorel@gmail.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_HELO_NONE, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/3] fanotify: Move __kernel_fsid_t definition to correct place X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Kara Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" This fixes errors: fanotify.h:149:55: error: unknown type name ‘__kernel_fsid_t’ static inline void fanotify_get_fid(const char *path, __kernel_fsid_t *fsid, ^~~~~~~~~~~~~~~ fanotify13.c:47:2: error: unknown type name ‘__kernel_fsid_t’ __kernel_fsid_t fsid; Remove #ifdef HAVE_NAME_TO_HANDLE_AT wrap of __kernel_fsid_t fallback definition to simplify preprocessor checks. Fixes: b8aebc835 ("fanotify: Fix missing __kernel_fsid_t definition") Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/fanotify/fanotify.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h index 435f100d8..573ed5f59 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify.h +++ b/testcases/kernel/syscalls/fanotify/fanotify.h @@ -116,6 +116,13 @@ struct fanotify_mark_type { const char * name; }; +#ifndef __kernel_fsid_t +typedef struct { + int val[2]; +} lapi_fsid_t; +#define __kernel_fsid_t lapi_fsid_t +#endif /* __kernel_fsid_t */ + #ifndef FAN_REPORT_FID #define FAN_REPORT_FID 0x00000200 @@ -126,20 +133,13 @@ struct fanotify_event_info_header { }; #ifdef HAVE_NAME_TO_HANDLE_AT -#ifndef __kernel_fsid_t -typedef struct { - int val[2]; -} lapi_fsid_t; -#define __kernel_fsid_t lapi_fsid_t -#endif - struct fanotify_event_info_fid { struct fanotify_event_info_header hdr; __kernel_fsid_t fsid; unsigned char handle[0]; }; -#endif -#endif +#endif /* HAVE_NAME_TO_HANDLE_AT */ +#endif /* ! FAN_REPORT_FID */ #ifdef HAVE_NAME_TO_HANDLE_AT /*