linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / pipe_fs_i.h

diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 407c0e0..b12e59c 100644 (file)
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -2,10 +2,27 @@
 #define _LINUX_PIPE_FS_I_H
 
 #define PIPEFS_MAGIC 0x50495045
+
+#define PIPE_BUFFERS (16)
+
+struct pipe_buffer {
+       struct page *page;
+       unsigned int offset, len;
+       struct pipe_buf_operations *ops;
+};
+
+struct pipe_buf_operations {
+       int can_merge;
+       void * (*map)(struct file *, struct pipe_inode_info *, struct pipe_buffer *);
+       void (*unmap)(struct pipe_inode_info *, struct pipe_buffer *);
+       void (*release)(struct pipe_inode_info *, struct pipe_buffer *);
+};
+
 struct pipe_inode_info {
        wait_queue_head_t wait;
-       char *base;
-       unsigned int len;
+       unsigned int nrbufs, curbuf;
+       struct pipe_buffer bufs[PIPE_BUFFERS];
+       struct page *tmp_page;
        unsigned int start;
        unsigned int readers;
        unsigned int writers;
@@ -20,11 +37,8 @@ struct pipe_inode_info {
    memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */
 #define PIPE_SIZE              PAGE_SIZE
 
-#define PIPE_SEM(inode)                (&(inode).i_sem)
+#define PIPE_MUTEX(inode)      (&(inode).i_mutex)
 #define PIPE_WAIT(inode)       (&(inode).i_pipe->wait)
-#define PIPE_BASE(inode)       ((inode).i_pipe->base)
-#define PIPE_START(inode)      ((inode).i_pipe->start)
-#define PIPE_LEN(inode)                ((inode).i_pipe->len)
 #define PIPE_READERS(inode)    ((inode).i_pipe->readers)
 #define PIPE_WRITERS(inode)    ((inode).i_pipe->writers)
 #define PIPE_WAITING_WRITERS(inode)    ((inode).i_pipe->waiting_writers)
@@ -33,16 +47,10 @@ struct pipe_inode_info {
 #define PIPE_FASYNC_READERS(inode)     (&((inode).i_pipe->fasync_readers))
 #define PIPE_FASYNC_WRITERS(inode)     (&((inode).i_pipe->fasync_writers))
 
-#define PIPE_EMPTY(inode)      (PIPE_LEN(inode) == 0)
-#define PIPE_FULL(inode)       (PIPE_LEN(inode) == PIPE_SIZE)
-#define PIPE_FREE(inode)       (PIPE_SIZE - PIPE_LEN(inode))
-#define PIPE_END(inode)        ((PIPE_START(inode) + PIPE_LEN(inode)) & (PIPE_SIZE-1))
-#define PIPE_MAX_RCHUNK(inode) (PIPE_SIZE - PIPE_START(inode))
-#define PIPE_MAX_WCHUNK(inode) (PIPE_SIZE - PIPE_END(inode))
-
 /* Drop the inode semaphore and wait for a pipe event, atomically */
 void pipe_wait(struct inode * inode);
 
 struct inode* pipe_new(struct inode* inode);
+void free_pipe_info(struct inode* inode);
 
 #endif