Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757336AbZLDUrz (ORCPT ); Fri, 4 Dec 2009 15:47:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757326AbZLDUry (ORCPT ); Fri, 4 Dec 2009 15:47:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33052 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757311AbZLDUrw (ORCPT ); Fri, 4 Dec 2009 15:47:52 -0500 From: Eric Paris Subject: [RFC PATCH 04/15] inotify: use alloc_file instead of doing it internally To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: viro@zeniv.linux.org.uk, jmorris@namei.org, npiggin@suse.de, eparis@redhat.com, zohar@us.ibm.com, jack@suse.cz, jmalicki@metacarta.com, dsmith@redhat.com, serue@us.ibm.com, hch@lst.de, john@johnmccutchan.com, rlove@rlove.org, ebiederm@xmission.com, heiko.carstens@de.ibm.com, penguin-kernel@I-love.SAKURA.ne.jp, mszeredi@suse.cz, jens.axboe@oracle.com, akpm@linux-foundation.org, matthew@wil.cx, hugh.dickins@tiscali.co.uk, kamezawa.hiroyu@jp.fujitsu.com, nishimura@mxp.nes.nec.co.jp, davem@davemloft.net, arnd@arndb.de, eric.dumazet@gmail.com Date: Fri, 04 Dec 2009 15:47:12 -0500 Message-ID: <20091204204712.18286.25223.stgit@paris.rdu.redhat.com> In-Reply-To: <20091204204646.18286.24853.stgit@paris.rdu.redhat.com> References: <20091204204646.18286.24853.stgit@paris.rdu.redhat.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2082 Lines: 73 inotify basically duplicates everything from alloc-file and init-file. Use the generic vfs functions instead. Signed-off-by: Eric Paris Acked-by: Miklos Szeredi --- fs/notify/inotify/inotify_user.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index c40894a..3e03803 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -725,6 +725,7 @@ SYSCALL_DEFINE1(inotify_init1, int, flags) struct fsnotify_group *group; struct user_struct *user; struct file *filp; + struct dentry *dentry; int fd, ret; /* Check the IN_* constants for consistency. */ @@ -738,12 +739,6 @@ SYSCALL_DEFINE1(inotify_init1, int, flags) if (fd < 0) return fd; - filp = get_empty_filp(); - if (!filp) { - ret = -ENFILE; - goto out_put_fd; - } - user = get_current_user(); if (unlikely(atomic_read(&user->inotify_devs) >= inotify_max_user_instances)) { @@ -758,11 +753,12 @@ SYSCALL_DEFINE1(inotify_init1, int, flags) goto out_free_uid; } - filp->f_op = &inotify_fops; - filp->f_path.mnt = mntget(inotify_mnt); - filp->f_path.dentry = dget(inotify_mnt->mnt_root); - filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping; - filp->f_mode = FMODE_READ; + dentry = dget(inotify_mnt->mnt_root); + filp = alloc_file(inotify_mnt, dentry, FMODE_READ, &inotify_fops); + if (!filp) { + ret = -ENFILE; + goto out_dput; + } filp->f_flags = O_RDONLY | (flags & O_NONBLOCK); filp->private_data = group; @@ -771,11 +767,10 @@ SYSCALL_DEFINE1(inotify_init1, int, flags) fd_install(fd, filp); return fd; - +out_dput: + dput(dentry); out_free_uid: free_uid(user); - put_filp(filp); -out_put_fd: put_unused_fd(fd); return ret; } -- 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/