Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752495AbaLYOsn (ORCPT ); Thu, 25 Dec 2014 09:48:43 -0500 Received: from mout.gmx.net ([212.227.15.18]:58040 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750923AbaLYOsl (ORCPT ); Thu, 25 Dec 2014 09:48:41 -0500 Message-ID: <549C239B.8020204@gmx.de> Date: Thu, 25 Dec 2014 15:47:55 +0100 From: Heinrich Schuchardt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.3.0 MIME-Version: 1.0 CC: Jan Kara , David Drysdale , Alexander Viro , Eric Paris , David Miller , Arnd Bergmann , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, Andrew Morton Subject: Re: [PATCHv2 1/1] vfs: renumber FMODE_NONOTIFY and add to uniqueness check References: <1416828199-3414-1-git-send-email-drysdale@google.com> <1416828199-3414-2-git-send-email-drysdale@google.com> <20141124113008.GF1888@quack.suse.cz> In-Reply-To: <20141124113008.GF1888@quack.suse.cz> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:+8fmTaGUm5SfbQ5ski3dirF8Xw9XMG5rpkcwQ6UVtijAa0I0BGJ JECgxLOp3VluN6FjqubJBbs4Kcqqmer4bsLs7NuoHsfao98uayG2TMkgDmMmvOeCqd7D8+g olVBq/NKGp8zztoWEVj9jdwPuFeQ01tUnMRdOA0oYSIWVccxB1fDM6kLg6kbKjtRBrsfdea e86aE8Mh1oHOToZR23pyA== X-UI-Out-Filterresults: notjunk:1; To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Andrew, could you, please, consider the patch proposed in https://lkml.org/lkml/2014/11/24/196 for inclusion into the mm-tree. This 2nd version of the patch considers the review comments in the thread starting at https://lkml.org/lkml/2014/11/21/141. Best regards Heinrich Schuchardt On 24.11.2014 12:30, Jan Kara wrote: > On Mon 24-11-14 11:23:19, David Drysdale wrote: >> Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc. >> The clashing O_PATH value was added in 5229645bdc35f1cc43eb ("vfs: add >> nonconflicting values for O_PATH") but this can't be changed as it >> is user-visible. >> >> FMODE_NONOTIFY is only used internally in the kernel, but it is in >> the same numbering space as the other O_* flags, as indicated by the >> comment at the top of include/uapi/asm-generic/fcntl.h (and its use >> in fs/notify/fanotify/fanotify_user.c). So renumber it to avoid >> the clash. >> >> All of this has happened before (12ed2e36c98aec6c4155, "fanotify: >> FMODE_NONOTIFY and __O_SYNC in sparc conflict"), and all of this >> will happen again -- so update the uniqueness check in fcntl_init() >> to include __FMODE_NONOTIFY. >> >> Signed-off-by: David Drysdale >> Acked-by: David S. Miller > Looks good. You can add: > Acked-by: Jan Kara > > Honza > >> --- >> fs/fcntl.c | 5 +++-- >> include/linux/fs.h | 2 +- >> include/uapi/asm-generic/fcntl.h | 2 +- >> 3 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/fs/fcntl.c b/fs/fcntl.c >> index 99d440a4a6ba..ee85cd4e136a 100644 >> --- a/fs/fcntl.c >> +++ b/fs/fcntl.c >> @@ -740,14 +740,15 @@ static int __init fcntl_init(void) >> * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY >> * is defined as O_NONBLOCK on some platforms and not on others. >> */ >> - BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32( >> + BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32( >> O_RDONLY | O_WRONLY | O_RDWR | >> O_CREAT | O_EXCL | O_NOCTTY | >> O_TRUNC | O_APPEND | /* O_NONBLOCK | */ >> __O_SYNC | O_DSYNC | FASYNC | >> O_DIRECT | O_LARGEFILE | O_DIRECTORY | >> O_NOFOLLOW | O_NOATIME | O_CLOEXEC | >> - __FMODE_EXEC | O_PATH | __O_TMPFILE >> + __FMODE_EXEC | O_PATH | __O_TMPFILE | >> + __FMODE_NONOTIFY >> )); >> >> fasync_cache = kmem_cache_create("fasync_cache", >> diff --git a/include/linux/fs.h b/include/linux/fs.h >> index 9ab779e8a63c..fc1c2488adbc 100644 >> --- a/include/linux/fs.h >> +++ b/include/linux/fs.h >> @@ -134,7 +134,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset, >> #define FMODE_CAN_WRITE ((__force fmode_t)0x40000) >> >> /* File was opened by fanotify and shouldn't generate fanotify events */ >> -#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) >> +#define FMODE_NONOTIFY ((__force fmode_t)0x4000000) >> >> /* >> * Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector >> diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h >> index 7543b3e51331..e063effe0cc1 100644 >> --- a/include/uapi/asm-generic/fcntl.h >> +++ b/include/uapi/asm-generic/fcntl.h >> @@ -5,7 +5,7 @@ >> >> /* >> * FMODE_EXEC is 0x20 >> - * FMODE_NONOTIFY is 0x1000000 >> + * FMODE_NONOTIFY is 0x4000000 >> * These cannot be used by userspace O_* until internal and external open >> * flags are split. >> * -Eric Paris >> -- >> 2.1.0.rc2.206.gedb03e5 >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/