diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-12 23:18:05 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-27 03:08:50 +0200 |
| commit | 1a7bd2265fc57f29400d57f66275cc5918e30aa6 (patch) | |
| tree | 48a4bb42dfb5d4b37d077bbaf550253686b546f5 | |
| parent | unexport sock_map_fd(), switch to sock_alloc_file() (diff) | |
| download | linux-1a7bd2265fc57f29400d57f66275cc5918e30aa6.tar.xz linux-1a7bd2265fc57f29400d57f66275cc5918e30aa6.zip | |
make get_unused_fd_flags() a function
... and get_unused_fd() a macro around it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/file.c | 6 | ||||
| -rw-r--r-- | include/linux/file.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/file.c b/fs/file.c index ba3f6053025c..5b46e9970a7a 100644 --- a/fs/file.c +++ b/fs/file.c @@ -477,8 +477,8 @@ out: return error; } -int get_unused_fd(void) +int get_unused_fd_flags(unsigned flags) { - return alloc_fd(0, 0); + return alloc_fd(0, flags); } -EXPORT_SYMBOL(get_unused_fd); +EXPORT_SYMBOL(get_unused_fd_flags); diff --git a/include/linux/file.h b/include/linux/file.h index a22408bac0d0..86795ec6027d 100644 --- a/include/linux/file.h +++ b/include/linux/file.h @@ -33,8 +33,8 @@ extern struct file *fget_raw_light(unsigned int fd, int *fput_needed); extern void set_close_on_exec(unsigned int fd, int flag); extern void put_filp(struct file *); extern int alloc_fd(unsigned start, unsigned flags); -extern int get_unused_fd(void); -#define get_unused_fd_flags(flags) alloc_fd(0, (flags)) +extern int get_unused_fd_flags(unsigned flags); +#define get_unused_fd() get_unused_fd_flags(0) extern void put_unused_fd(unsigned int fd); extern void fd_install(unsigned int fd, struct file *file); |