Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9dbca3 authored by Ulrich Drepper's avatar Ulrich Drepper Committed by Linus Torvalds
Browse files

flag parameters: anon_inode_getfd extension 



This patch just extends the anon_inode_getfd interface to take an additional
parameter with a flag value.  The flag value is passed on to
get_unused_fd_flags in anticipation for a use with the O_CLOEXEC flag.

No actual semantic changes here, the changed callers all pass 0 for now.

[akpm@linux-foundation.org: KVM fix]
Signed-off-by: default avatarUlrich Drepper <drepper@redhat.com>
Acked-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c019bbc6

fs/anon_inodes.c

+5 −4
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ static struct dentry_operations anon_inodefs_dentry_operations = { 
 *                    of the file

 *

 * @name:    [in]    name of the "class" of the new file

 * @fops     [in]    file operations for the new file

 * @priv     [in]    private data for the new file (will be file's private_data)

 * @fops:    [in]    file operations for the new file

 * @priv:    [in]    private data for the new file (will be file's private_data)

 * @flags:   [in]    flags

 *

 * Creates a new file by hooking it on a single inode. This is useful for files

 * that do not need to have a full-fledged inode in order to operate correctly.
@@ -68,7 +69,7 @@ static struct dentry_operations anon_inodefs_dentry_operations = { 
 * setup.  Returns new descriptor or -error.

 */

int anon_inode_getfd(const char *name, const struct file_operations *fops,

		     void *priv)

		     void *priv, int flags)

{

	struct qstr this;

	struct dentry *dentry;
@@ -78,7 +79,7 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops, 
	if (IS_ERR(anon_inode_inode))

		return -ENODEV;



	error = get_unused_fd();

	error = get_unused_fd_flags(flags);

	if (error < 0)

		return error;

	fd = error;

fs/eventfd.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ asmlinkage long sys_eventfd(unsigned int count) 
	 * When we call this, the initialization must be complete, since

	 * anon_inode_getfd() will install the fd.

	 */

	fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx);

	fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx, 0);

	if (fd < 0)

		kfree(ctx);

	return fd;

fs/eventpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ asmlinkage long sys_epoll_create(int size) 
	 * Creates all the items needed to setup an eventpoll file. That is,

	 * a file structure and a free file descriptor.

	 */

	fd = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep);

	fd = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep, 0);

	if (fd < 0)

		ep_free(ep);

fs/signalfd.c

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas 
		 * When we call this, the initialization must be complete, since

		 * anon_inode_getfd() will install the fd.

		 */

		ufd = anon_inode_getfd("[signalfd]", &signalfd_fops, ctx);

		ufd = anon_inode_getfd("[signalfd]", &signalfd_fops, ctx,

				       0);

		if (ufd < 0)

			kfree(ctx);

	} else {

fs/timerfd.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ asmlinkage long sys_timerfd_create(int clockid, int flags) 
	ctx->clockid = clockid;

	hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS);



	ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx);

	ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx, 0);

	if (ufd < 0)

		kfree(ctx);