lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flag parameters: anon_inode_getfd extension

Browse Source 
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: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ulrich Drepper
2008-07-23 21:29:22 -07:00
committed by Linus Torvalds
parent c019bbc612
commit 7d9dbca342
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/anon_inodes.c
View File

@@ -58,8 +58,9 @@ static struct dentry_operations anon_inodefs_dentry_operations = {
* of the file * of the file
* *
* @name: [in] name of the "class" of the new file * @name: [in] name of the "class" of the new file
* @fops [in] file operations for 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) * @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 * 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. * 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. * setup. Returns new descriptor or -error.
*/ */
int anon_inode_getfd(const char *name, const struct file_operations *fops, int anon_inode_getfd(const char *name, const struct file_operations *fops,
void *priv) void *priv, int flags)
{ {
struct qstr this; struct qstr this;
struct dentry *dentry; 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)) if (IS_ERR(anon_inode_inode))
return -ENODEV; return -ENODEV;
error = get_unused_fd(); error = get_unused_fd_flags(flags);
if (error < 0) if (error < 0)
return error; return error;
fd = error; fd = error;

2
fs/eventfd.c
View File

@@ -214,7 +214,7 @@ asmlinkage long sys_eventfd(unsigned int count)
* When we call this, the initialization must be complete, since * When we call this, the initialization must be complete, since
* anon_inode_getfd() will install the fd. * 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) if (fd < 0)
kfree(ctx); kfree(ctx);
return fd; return fd;

2
fs/eventpoll.c
View File

@@ -1068,7 +1068,7 @@ asmlinkage long sys_epoll_create(int size)
* Creates all the items needed to setup an eventpoll file. That is, * Creates all the items needed to setup an eventpoll file. That is,
* a file structure and a free file descriptor. * 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) if (fd < 0)
ep_free(ep); ep_free(ep);

3
fs/signalfd.c
View File

@@ -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 * When we call this, the initialization must be complete, since
* anon_inode_getfd() will install the fd. * 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) if (ufd < 0)
kfree(ctx); kfree(ctx);
} else { } else {

2
fs/timerfd.c
View File

@@ -198,7 +198,7 @@ asmlinkage long sys_timerfd_create(int clockid, int flags)
ctx->clockid = clockid; ctx->clockid = clockid;
hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS); 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) if (ufd < 0)
kfree(ctx); kfree(ctx);

2
include/linux/anon_inodes.h
View File

@@ -9,7 +9,7 @@
#define _LINUX_ANON_INODES_H #define _LINUX_ANON_INODES_H
int anon_inode_getfd(const char *name, const struct file_operations *fops, int anon_inode_getfd(const char *name, const struct file_operations *fops,
void *priv); void *priv, int flags);
#endif /* _LINUX_ANON_INODES_H */ #endif /* _LINUX_ANON_INODES_H */

4
virt/kvm/kvm_main.c
View File

@@ -902,7 +902,7 @@ static const struct file_operations kvm_vcpu_fops = {
*/ */
static int create_vcpu_fd(struct kvm_vcpu *vcpu) static int create_vcpu_fd(struct kvm_vcpu *vcpu)
{ {
int fd = anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu); int fd = anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu, 0);
if (fd < 0) if (fd < 0)
kvm_put_kvm(vcpu->kvm); kvm_put_kvm(vcpu->kvm);
return fd; return fd;
@@ -1261,7 +1261,7 @@ static int kvm_dev_ioctl_create_vm(void)
kvm = kvm_create_vm(); kvm = kvm_create_vm();
if (IS_ERR(kvm)) if (IS_ERR(kvm))
return PTR_ERR(kvm); return PTR_ERR(kvm);
fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm); fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, 0);
if (fd < 0) if (fd < 0)
kvm_put_kvm(kvm); kvm_put_kvm(kvm);