From 731d25182e0a28d71869a63604a0f8efca8315a0 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 12 Aug 2012 17:18:05 -0400
Subject: [PATCH] --- yaml --- r: 328958 b: refs/heads/master c:
 1a7bd2265fc57f29400d57f66275cc5918e30aa6 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/fs/file.c            | 6 +++---
 trunk/include/linux/file.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e610b1042d79..86f62a9c88d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285
+refs/heads/master: 1a7bd2265fc57f29400d57f66275cc5918e30aa6
diff --git a/trunk/fs/file.c b/trunk/fs/file.c
index ba3f6053025c..5b46e9970a7a 100644
--- a/trunk/fs/file.c
+++ b/trunk/fs/file.c
@@ -477,8 +477,8 @@ int alloc_fd(unsigned start, unsigned flags)
 	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/trunk/include/linux/file.h b/trunk/include/linux/file.h
index a22408bac0d0..86795ec6027d 100644
--- a/trunk/include/linux/file.h
+++ b/trunk/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);