patch-2.3.15 linux/include/linux/pipe_fs_i.h

• Lines: 46
• Date: Tue Aug 24 10:12:00 1999
• Orig file: v2.3.14/linux/include/linux/pipe_fs_i.h
• Orig date: Wed Jun 16 19:26:27 1999

diff -u --recursive --new-file v2.3.14/linux/include/linux/pipe_fs_i.h linux/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