diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/linux/pipe_fs_i.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/linux/pipe_fs_i.h')
| -rw-r--r-- | include/linux/pipe_fs_i.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index c00d37845..eb2d91054 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -3,32 +3,29 @@ struct pipe_inode_info { wait_queue_head_t wait; - char * base; + char *base; unsigned int start; - unsigned int lock; - unsigned int rd_openers; - unsigned int wr_openers; unsigned int readers; unsigned int writers; }; -#define PIPE_WAIT(inode) ((inode).i_pipe->wait) +/* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual + memory allocation, whereas PIPE_BUF makes atomicity guarantees. */ +#define PIPE_SIZE PAGE_SIZE + +#define PIPE_SEM(inode) (&(inode).i_sem) +#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_size) -#define PIPE_RD_OPENERS(inode) ((inode).i_pipe->rd_openers) -#define PIPE_WR_OPENERS(inode) ((inode).i_pipe->wr_openers) #define PIPE_READERS(inode) ((inode).i_pipe->readers) #define PIPE_WRITERS(inode) ((inode).i_pipe->writers) -#define PIPE_LOCK(inode) ((inode).i_pipe->lock) -#define PIPE_SIZE(inode) PIPE_LEN(inode) -#define PIPE_EMPTY(inode) (PIPE_SIZE(inode)==0) -#define PIPE_FULL(inode) (PIPE_SIZE(inode)==PIPE_BUF) -#define PIPE_FREE(inode) (PIPE_BUF - PIPE_LEN(inode)) -#define PIPE_END(inode) ((PIPE_START(inode)+PIPE_LEN(inode))&\ - (PIPE_BUF-1)) -#define PIPE_MAX_RCHUNK(inode) (PIPE_BUF - PIPE_START(inode)) -#define PIPE_MAX_WCHUNK(inode) (PIPE_BUF - PIPE_END(inode)) +#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)) #endif |