On Thu, 03 Dec 2009, Eric Paris wrote:
> inotify basically duplicates everything from alloc-file and init-file. Use
> the generic vfs functions instead.
>
> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
Acked-by: Miklos Szeredi <miklos@xxxxxxxxxx>
> ---
>
> 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-fsdevel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
