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
sparc64: Fix OOPS in psycho_pcierr_intr_other().
[pandora-kernel.git]
/
fs
/
fifo.c
diff --git
a/fs/fifo.c
b/fs/fifo.c
index
49035b1
..
987bf94
100644
(file)
--- a/
fs/fifo.c
+++ b/
fs/fifo.c
@@
-11,8
+11,8
@@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/fs.h>
+#include <linux/sched.h>
#include <linux/pipe_fs_i.h>
static void wait_for_partner(struct inode* inode, unsigned int *cnt)
#include <linux/pipe_fs_i.h>
static void wait_for_partner(struct inode* inode, unsigned int *cnt)
@@
-57,7
+57,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
* POSIX.1 says that O_NONBLOCK means return with the FIFO
* opened, even when there is no process writing the FIFO.
*/
* POSIX.1 says that O_NONBLOCK means return with the FIFO
* opened, even when there is no process writing the FIFO.
*/
- filp->f_op = &read_fifo_fops;
+ filp->f_op = &read_
pipe
fifo_fops;
pipe->r_counter++;
if (pipe->readers++ == 0)
wake_up_partner(inode);
pipe->r_counter++;
if (pipe->readers++ == 0)
wake_up_partner(inode);
@@
-86,7
+86,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
goto err;
if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
goto err;
- filp->f_op = &write_fifo_fops;
+ filp->f_op = &write_
pipe
fifo_fops;
pipe->w_counter++;
if (!pipe->writers++)
wake_up_partner(inode);
pipe->w_counter++;
if (!pipe->writers++)
wake_up_partner(inode);
@@
-105,7
+105,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
* This implementation will NEVER block on a O_RDWR open, since
* the process can at least talk to itself.
*/
* This implementation will NEVER block on a O_RDWR open, since
* the process can at least talk to itself.
*/
- filp->f_op = &rdwr_fifo_fops;
+ filp->f_op = &rdwr_
pipe
fifo_fops;
pipe->readers++;
pipe->writers++;
pipe->readers++;
pipe->writers++;
@@
-151,5
+151,5
@@
err_nocleanup:
* depending on the access mode of the file...
*/
const struct file_operations def_fifo_fops = {
* depending on the access mode of the file...
*/
const struct file_operations def_fifo_fops = {
- .open = fifo_open, /* will set read
or write pipe
_fops */
+ .open = fifo_open, /* will set read
_ or write_pipefifo
_fops */
};
};