git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: mm: don't override huge page cache attributes
[pandora-kernel.git]
/
fs
/
fifo.c
diff --git
a/fs/fifo.c
b/fs/fifo.c
index
b1a524d
..
cf6f434
100644
(file)
--- a/
fs/fifo.c
+++ b/
fs/fifo.c
@@
-14,7
+14,7
@@
#include <linux/sched.h>
#include <linux/pipe_fs_i.h>
#include <linux/sched.h>
#include <linux/pipe_fs_i.h>
-static
void
wait_for_partner(struct inode* inode, unsigned int *cnt)
+static
int
wait_for_partner(struct inode* inode, unsigned int *cnt)
{
int cur = *cnt;
{
int cur = *cnt;
@@
-23,6
+23,7
@@
static void wait_for_partner(struct inode* inode, unsigned int *cnt)
if (signal_pending(current))
break;
}
if (signal_pending(current))
break;
}
+ return cur == *cnt ? -ERESTARTSYS : 0;
}
static void wake_up_partner(struct inode* inode)
}
static void wake_up_partner(struct inode* inode)
@@
-67,8
+68,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
* seen a writer */
filp->f_version = pipe->w_counter;
} else {
* seen a writer */
filp->f_version = pipe->w_counter;
} else {
- wait_for_partner(inode, &pipe->w_counter);
- if(signal_pending(current))
+ if (wait_for_partner(inode, &pipe->w_counter))
goto err_rd;
}
}
goto err_rd;
}
}
@@
-90,8
+90,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
wake_up_partner(inode);
if (!pipe->readers) {
wake_up_partner(inode);
if (!pipe->readers) {
- wait_for_partner(inode, &pipe->r_counter);
- if (signal_pending(current))
+ if (wait_for_partner(inode, &pipe->r_counter))
goto err_wr;
}
break;
goto err_wr;
}
break;