Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38005
b: refs/heads/master
c: c3b6571
h: refs/heads/master
i:
  38003: 2d47857
v: v3
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Oct 3, 2006
1 parent 1a19fa5 commit 9ba2c4f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1ca66d1b990b23e7753c729332c0ada61f4f38d
refs/heads/master: c3b6571384024be31e8b3442c0e7c3b127110d9b
5 changes: 3 additions & 2 deletions trunk/fs/eventpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,10 @@ static int ep_getfd(int *efd, struct inode **einode, struct file **efile,

/* Allocates an inode from the eventpoll file system */
inode = ep_eventpoll_inode();
error = PTR_ERR(inode);
if (IS_ERR(inode))
if (IS_ERR(inode)) {
error = PTR_ERR(inode);
goto eexit_2;
}

/* Allocates a free descriptor to plug the file onto */
error = get_unused_fd();
Expand Down

0 comments on commit 9ba2c4f

Please sign in to comment.