From: Philip Homburg Date: Tue, 7 Aug 2007 14:27:19 +0000 (+0000) Subject: Removed invalid consistency check. X-Git-Tag: v3.1.4~337 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/openssl_button.gif?a=commitdiff_plain;h=d232b2ef425af7c591a64421c677e5cce09df331;p=minix.git Removed invalid consistency check. --- diff --git a/servers/vfs/read.c b/servers/vfs/read.c index fa37d4d43..c37e06b42 100644 --- a/servers/vfs/read.c +++ b/servers/vfs/read.c @@ -91,19 +91,12 @@ int rw_flag; /* READING or WRITING */ { if (rw_flag == WRITING) { - if (vp->v_w_pipe_busy) - { - panic(__FILE__, - "read_write: pipe already has a writer", - NO_NUM); - } if (fp->fp_cum_io_partial != 0) { panic(__FILE__, "read_write: fp_cum_io_partial not clear for new pipe writer", NO_NUM); } - vp->v_w_pipe_busy= TRUE; } return rw_pipe(rw_flag, usr, m_in.fd, f, m_in.buffer, m_in.nbytes); } @@ -369,8 +362,6 @@ size_t req_size; } } fp->fp_cum_io_partial = 0; - if (rw_flag == WRITING) - vp->v_w_pipe_busy= FALSE; return cum_io; } diff --git a/servers/vfs/vnode.c b/servers/vfs/vnode.c index 6628a89cd..428b1cda7 100644 --- a/servers/vfs/vnode.c +++ b/servers/vfs/vnode.c @@ -34,7 +34,6 @@ int line; if (vp->v_ref_count == 0) { vp->v_pipe= NO_PIPE; - vp->v_w_pipe_busy= FALSE; vp->v_uid= -1; vp->v_gid= -1; vp->v_sdev= -1; diff --git a/servers/vfs/vnode.h b/servers/vfs/vnode.h index ee7dc6c7a..2b66c9420 100644 --- a/servers/vfs/vnode.h +++ b/servers/vfs/vnode.h @@ -11,7 +11,6 @@ EXTERN struct vnode { int v_fs_count; /* # reference at the underlying FS */ int v_ref_check; /* for consistency checks */ char v_pipe; /* set to I_PIPE if pipe */ - char v_w_pipe_busy; /* true iff writer suspended */ off_t v_pipe_rd_pos; off_t v_pipe_wr_pos; endpoint_t v_bfs_e; /* endpoint number for the FS proces in case