From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix.patch added to -mm tree Date: Fri, 09 Feb 2018 12:57:06 -0800 Message-ID: <5a7e0b22.MmFuegqWxX4mEK9O%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36096 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750853AbeBIU5J (ORCPT ); Fri, 9 Feb 2018 15:57:09 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, amir73il@gmail.com, gorcunov@openvz.org, jack@suse.cz, ktkhai@virtuozzo.com, mawilcox@microsoft.com, mm-commits@vger.kernel.org The patch titled Subject: inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix has been added to the -mm tree. Its filename is inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix cleanup Cc: Amir Goldstein Cc: Cyrill Gorcunov Cc: Jan Kara Cc: Kirill Tkhai Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- fs/notify/inotify/inotify_user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN fs/notify/inotify/inotify_user.c~inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix fs/notify/inotify/inotify_user.c --- a/fs/notify/inotify/inotify_user.c~inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix +++ a/fs/notify/inotify/inotify_user.c @@ -285,7 +285,6 @@ static int inotify_release(struct inode static long inotify_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct inotify_group_private_data *data __maybe_unused; struct fsnotify_group *group; struct fsnotify_event *fsn_event; void __user *p; @@ -294,7 +293,6 @@ static long inotify_ioctl(struct file *f group = file->private_data; p = (void __user *) arg; - data = &group->inotify_data; pr_debug("%s: group=%p cmd=%u\n", __func__, group, cmd); @@ -313,6 +311,9 @@ static long inotify_ioctl(struct file *f case INOTIFY_IOC_SETNEXTWD: ret = -EINVAL; if (arg >= 1 && arg <= INT_MAX) { + struct inotify_group_private_data *data; + + data = &group->inotify_data; spin_lock(&data->idr_lock); idr_set_cursor(&data->idr, (unsigned int)arg); spin_unlock(&data->idr_lock); _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch include-linux-sched-mmh-re-inline-mmdrop.patch mm-zpool-zpool_evictable-fix-mismatch-in-parameter-name-and-kernel-doc-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch inotify-extend-ioctl-to-allow-to-request-id-of-new-watch-descriptor-fix.patch mm.patch mm-initialize-pages-on-demand-during-boot-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch