From 97b61928fa370657e9f8a3c3c2a0e18d646cebd2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Mon, 8 Oct 2012 23:21:58 +0100
Subject: [PATCH] --- yaml --- r: 332191 b: refs/heads/master c:
 121977187ca0a7f20b848530deb04cc56167769b h: refs/heads/master i:   332189:
 df09c5436d932c041eba696b7ce5fff0467c0930   332187:
 414129491010eb7c6772151a30ded6cc9cbe5fa5   332183:
 cf9f58d8f0908c2d8ea8877579bd16960361a117   332175:
 0522b7e2110a621a009a1fbe90ff0fe440973c63   332159:
 bc147880f58dd083d9de221c94d1d9b41a6d89bb v: v3

---
 [refs]           | 2 +-
 trunk/fs/fcntl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9cbf75a7050..c8b2d9bfe21f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5a246eab9a268f51ba8189ea5b098a1bfff200e
+refs/heads/master: 121977187ca0a7f20b848530deb04cc56167769b
diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c
index 8f704291d4ed..71a600a19f06 100644
--- a/trunk/fs/fcntl.c
+++ b/trunk/fs/fcntl.c
@@ -258,7 +258,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
 		err = f_dupfd(arg, filp, 0);
 		break;
 	case F_DUPFD_CLOEXEC:
-		err = f_dupfd(arg, filp, FD_CLOEXEC);
+		err = f_dupfd(arg, filp, O_CLOEXEC);
 		break;
 	case F_GETFD:
 		err = get_close_on_exec(fd) ? FD_CLOEXEC : 0;