From patchwork Wed Oct 3 21:25:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10625321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7ABAC1515 for ; Wed, 3 Oct 2018 21:25:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B4D629075 for ; Wed, 3 Oct 2018 21:25:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F12E2907B; Wed, 3 Oct 2018 21:25:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FC3729075 for ; Wed, 3 Oct 2018 21:25:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726277AbeJDEP5 (ORCPT ); Thu, 4 Oct 2018 00:15:57 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:34233 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbeJDEP5 (ORCPT ); Thu, 4 Oct 2018 00:15:57 -0400 Received: by mail-wm1-f68.google.com with SMTP id z25-v6so159727wmf.1 for ; Wed, 03 Oct 2018 14:25:50 -0700 (PDT) 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=d+xj9mYOfQOIoJAsD1P4D2sHGzPIj13ANhwoNK+JALI=; b=Z9ZBNb1eVAHVIqIOuuroWcOE+Xk3W0hMDH18RuG75VtqPIUyKfwn4M94bInH1msz4Y itcciJxJH0uDCg2ickbHJnfWsgvBIusdZJZRLefyyXyhkKArsg8yYTYnnyCZMRscg64G PpVqbusDVFOUxy9DIPXxeNpLQzPiIh+H8KzRuYmcbzTQ1upfPb+RtsBO5cdj0GJqQ0FZ qGjapDT6TpgqenbaXkIbm5ezM4w1ydlVBH5zhMoR4vk9kLiRV93EV+Mnm3W64nAGKb5r SotyMezuXwjk2lOmknhcWcbMNkr0dlE3wyvqrGgVLFR9TGGwYtsjRUtN1THoSGwjUbcq H4QQ== 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=d+xj9mYOfQOIoJAsD1P4D2sHGzPIj13ANhwoNK+JALI=; b=pcEYiZcguxs96xpbdfS6bfgNusBk3PoIVN1ZHXO3R5JkSxtEPpvklDiYYq8O32eyxi O9RWoiLlMh0Z5EG7eWMOwHSI0BKjKPGs3+O7+Dmb8jaSibGfNxAWu3bwI6IvKHwOQkzb 4LseHh0eyK++3i3nysnY3RO4pcx9QPmFKXGwVrlvuuVoNQo30CwLT9PkwA8RoyVTzOF7 ycXuhO1IAbDxQW07IL460we68bhJyh9JauQ5g9iMSNqMX+8EN8XT42X/tMO7kiMKF8rZ uygZkuoHADnvOv0mBTePYRZtuaxhnckaM2kLgFXzvrpDtAtaoUDy3hkkrADuphGN3gMe P2Ew== X-Gm-Message-State: ABuFfoj0EDBpHyHaQjmuKCVfgKKRMY7zcZA85pk+YTeOQx7iwYXCfoxN igPivoc/DWTIg6gjaXij8N/O+IvF X-Google-Smtp-Source: ACcGV6091cpMU5hq50J46a2r9qKnlYPKLd0v5NCTraOwSR/a3J7tFJQMp+yXmHlraYYzFAz3EER7HA== X-Received: by 2002:a1c:adce:: with SMTP id w197-v6mr631226wme.11.1538601949496; Wed, 03 Oct 2018 14:25:49 -0700 (PDT) Received: from localhost.localdomain ([141.226.14.107]) by smtp.gmail.com with ESMTPSA id 193-v6sm4073866wmj.21.2018.10.03.14.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 14:25:49 -0700 (PDT) From: Amir Goldstein To: Jan Kara Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH v3 1/8] fanotify: fix collision of internal and uapi mark flags Date: Thu, 4 Oct 2018 00:25:32 +0300 Message-Id: <20181003212539.2384-2-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003212539.2384-1-amir73il@gmail.com> References: <20181003212539.2384-1-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new mark flag FAN_MARK_FILESYSTEMS collides with existing internal flag FAN_MARK_ONDIR. Change internal flag value to avoid the collision. Fixes: d54f4fba889b ("fanotify: add API to attach/detach super block mark") Signed-off-by: Amir Goldstein --- include/linux/fanotify.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h index 9c5ea3bdfaa0..e70fccc3757e 100644 --- a/include/linux/fanotify.h +++ b/include/linux/fanotify.h @@ -5,7 +5,7 @@ #include /* not valid from userspace, only kernel internal */ -#define FAN_MARK_ONDIR 0x00000100 +#define FAN_MARK_ONDIR 0x80000000 #define FAN_GROUP_FLAG(group, flag) \ ((group)->fanotify_data.flags & (flag))