aboutsummaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r--fs/eventpoll.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 2fdad4204044..0c87474f7917 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1046,7 +1046,7 @@ retry:
1046 * RB tree. With the current implementation, the "size" parameter is ignored 1046 * RB tree. With the current implementation, the "size" parameter is ignored
1047 * (besides sanity checks). 1047 * (besides sanity checks).
1048 */ 1048 */
1049asmlinkage long sys_epoll_create2(int size, int flags) 1049asmlinkage long sys_epoll_create1(int flags)
1050{ 1050{
1051 int error, fd = -1; 1051 int error, fd = -1;
1052 struct eventpoll *ep; 1052 struct eventpoll *ep;
@@ -1058,14 +1058,13 @@ asmlinkage long sys_epoll_create2(int size, int flags)
1058 return -EINVAL; 1058 return -EINVAL;
1059 1059
1060 DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d)\n", 1060 DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d)\n",
1061 current, size)); 1061 current, flags));
1062 1062
1063 /* 1063 /*
1064 * Sanity check on the size parameter, and create the internal data 1064 * Create the internal data structure ( "struct eventpoll" ).
1065 * structure ( "struct eventpoll" ).
1066 */ 1065 */
1067 error = -EINVAL; 1066 error = ep_alloc(&ep);
1068 if (size <= 0 || (error = ep_alloc(&ep)) < 0) { 1067 if (error < 0) {
1069 fd = error; 1068 fd = error;
1070 goto error_return; 1069 goto error_return;
1071 } 1070 }
@@ -1081,14 +1080,17 @@ asmlinkage long sys_epoll_create2(int size, int flags)
1081 1080
1082error_return: 1081error_return:
1083 DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n", 1082 DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
1084 current, size, fd)); 1083 current, flags, fd));
1085 1084
1086 return fd; 1085 return fd;
1087} 1086}
1088 1087
1089asmlinkage long sys_epoll_create(int size) 1088asmlinkage long sys_epoll_create(int size)
1090{ 1089{
1091 return sys_epoll_create2(size, 0); 1090 if (size < 0)
1091 return -EINVAL;
1092
1093 return sys_epoll_create1(0);
1092} 1094}
1093 1095
1094/* 1096/*