patch-2.4.19 linux-2.4.19/fs/pipe.c
Next file: linux-2.4.19/fs/proc/array.c
Previous file: linux-2.4.19/fs/partitions/msdos.c
Back to the patch index
Back to the overall index
- Lines: 76
- Date:
Fri Aug 2 17:39:45 2002
- Orig file:
linux-2.4.18/fs/pipe.c
- Orig date:
Fri Sep 28 18:03:48 2001
diff -urN linux-2.4.18/fs/pipe.c linux-2.4.19/fs/pipe.c
@@ -129,6 +129,8 @@
out_nolock:
if (read)
ret = read;
+
+ UPDATE_ATIME(inode);
return ret;
}
@@ -246,12 +248,6 @@
return -EPIPE;
}
-static loff_t
-pipe_lseek(struct file *file, loff_t offset, int orig)
-{
- return -ESPIPE;
-}
-
static ssize_t
bad_pipe_r(struct file *filp, char *buf, size_t count, loff_t *ppos)
{
@@ -381,7 +377,7 @@
* are also used in linux/fs/fifo.c to do operations on FIFOs.
*/
struct file_operations read_fifo_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: pipe_read,
write: bad_pipe_w,
poll: fifo_poll,
@@ -391,7 +387,7 @@
};
struct file_operations write_fifo_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: bad_pipe_r,
write: pipe_write,
poll: fifo_poll,
@@ -401,7 +397,7 @@
};
struct file_operations rdwr_fifo_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: pipe_read,
write: pipe_write,
poll: fifo_poll,
@@ -411,7 +407,7 @@
};
struct file_operations read_pipe_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: pipe_read,
write: bad_pipe_w,
poll: pipe_poll,
@@ -421,7 +417,7 @@
};
struct file_operations write_pipe_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: bad_pipe_r,
write: pipe_write,
poll: pipe_poll,
@@ -431,7 +427,7 @@
};
struct file_operations rdwr_pipe_fops = {
- llseek: pipe_lseek,
+ llseek: no_llseek,
read: pipe_read,
write: pipe_write,
poll: pipe_poll,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)