2 files changed, 18 insertions, 9 deletions

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 78b2ff044054..c9db73fc5e3d 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -110,7 +110,7 @@ out:
         return error;
 }
 
-static int dupfd(struct file *file, unsigned int start)
+static int dupfd(struct file *file, unsigned int start, int cloexec)
 {
         struct files_struct * files = current->files;
         struct fdtable *fdt;
@@ -122,7 +122,10 @@ static int dupfd(struct file *file, unsigned int start)
                 /* locate_fd() may have expanded fdtable, load the ptr */
                 fdt = files_fdtable(files);
                 FD_SET(fd, fdt->open_fds);
-                FD_CLR(fd, fdt->close_on_exec);
+                if (cloexec)
+                        FD_SET(fd, fdt->close_on_exec);
+                else
+                        FD_CLR(fd, fdt->close_on_exec);
                 spin_unlock(&files->file_lock);
                 fd_install(fd, file);
         } else {
@@ -195,7 +198,7 @@ asmlinkage long sys_dup(unsigned int fildes)
         struct file * file = fget(fildes);
 
         if (file)
-                ret = dupfd(file, 0);
+                ret = dupfd(file, 0, 0);
         return ret;
 }
 
@@ -319,8 +322,9 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
 
         switch (cmd) {
         case F_DUPFD:
+        case F_DUPFD_CLOEXEC:
                 get_file(filp);
-                err = dupfd(filp, arg);
+                err = dupfd(filp, arg, cmd == F_DUPFD_CLOEXEC);
                 break;
         case F_GETFD:
                 err = get_close_on_exec(fd) ? FD_CLOEXEC : 0;
diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index 40b93265d4ba..86037400a6e3 100644
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -3,12 +3,17 @@
 
 #include <asm/fcntl.h>
 
-/* Cancel a blocking posix lock; internal use only until we expose an
- * asynchronous lock api to userspace: */
-#define F_CANCELLK      (F_LINUX_SPECIFIC_BASE+5)
+#define F_SETLEASE      (F_LINUX_SPECIFIC_BASE + 0)
+#define F_GETLEASE      (F_LINUX_SPECIFIC_BASE + 1)
 
-#define F_SETLEASE      (F_LINUX_SPECIFIC_BASE+0)
-#define F_GETLEASE      (F_LINUX_SPECIFIC_BASE+1)
+/*
+ * Cancel a blocking posix lock; internal use only until we expose an
+ * asynchronous lock api to userspace:
+ */
+#define F_CANCELLK      (F_LINUX_SPECIFIC_BASE + 5)
+
+/* Create a file descriptor with FD_CLOEXEC set. */
+#define F_DUPFD_CLOEXEC (F_LINUX_SPECIFIC_BASE + 6)
 
 /*
  * Request nofications on a directory.