This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 3e3e2e5..737271c 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -94,6 +94,10 @@ pipe_readv(struct file *filp, const struct iovec *_iov,
        struct iovec *iov = (struct iovec *)_iov;
        size_t total_len;
 
+       /* pread is not allowed on pipes. */
+       if (unlikely(ppos != &filp->f_pos))
+               return -ESPIPE;
+
        total_len = iov_length(iov, nr_segs);
        /* Null read succeeds. */
        if (unlikely(total_len == 0))
@@ -183,6 +187,10 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
        struct iovec *iov = (struct iovec *)_iov;
        size_t total_len;
 
+       /* pwrite is not allowed on pipes. */
+       if (unlikely(ppos != &filp->f_pos))
+               return -ESPIPE;
+
        total_len = iov_length(iov, nr_segs);
        /* Null write succeeds. */
        if (unlikely(total_len == 0))
@@ -255,7 +263,7 @@ pipe_writev(struct file *filp, const struct iovec *_iov,
                kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
        }
        if (ret > 0)
-               inode_update_time(inode, filp->f_vfsmnt, 1);    /* mtime and ctime */
+               inode_update_time(inode, 1);    /* mtime and ctime */
        return ret;
 }
 
@@ -648,13 +656,13 @@ int do_pipe(int *fd)
        f1->f_pos = f2->f_pos = 0;
        f1->f_flags = O_RDONLY;
        f1->f_op = &read_pipe_fops;
-       f1->f_mode = FMODE_READ;
+       f1->f_mode = 1;
        f1->f_version = 0;
 
        /* write file */
        f2->f_flags = O_WRONLY;
        f2->f_op = &write_pipe_fops;
-       f2->f_mode = FMODE_WRITE;
+       f2->f_mode = 2;
        f2->f_version = 0;
 
        fd_install(i, f1);
@@ -680,8 +688,6 @@ no_files:
        return error;   
 }
 
-EXPORT_SYMBOL_GPL(do_pipe);
-
 /*
  * pipefs should _never_ be mounted by userland - too much of security hassle,
  * no real gain from having the whole whorehouse mounted. So we don't need