Forgot to remove some parts of the previous read lock.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6892 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -158,7 +158,6 @@ class Inode {
|
|||||||
DoublyLinked::List<ReadRequest> fDoneRequests;
|
DoublyLinked::List<ReadRequest> fDoneRequests;
|
||||||
|
|
||||||
benaphore fRequestLock;
|
benaphore fRequestLock;
|
||||||
sem_id fReadLock;
|
|
||||||
sem_id fWriteLock;
|
sem_id fWriteLock;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -423,7 +422,6 @@ Inode::Inode(Volume *volume, const char *name, int32 type)
|
|||||||
fType = type;
|
fType = type;
|
||||||
|
|
||||||
if (type == S_IFIFO) {
|
if (type == S_IFIFO) {
|
||||||
fReadLock = create_sem(0, "pipe read");
|
|
||||||
fWriteLock = create_sem(1, "pipe write");
|
fWriteLock = create_sem(1, "pipe write");
|
||||||
benaphore_init(&fRequestLock, "pipe request");
|
benaphore_init(&fRequestLock, "pipe request");
|
||||||
}
|
}
|
||||||
@@ -435,7 +433,6 @@ Inode::~Inode()
|
|||||||
free(const_cast<char *>(fName));
|
free(const_cast<char *>(fName));
|
||||||
|
|
||||||
if (fType == S_IFIFO) {
|
if (fType == S_IFIFO) {
|
||||||
delete_sem(fReadLock);
|
|
||||||
delete_sem(fWriteLock);
|
delete_sem(fWriteLock);
|
||||||
benaphore_destroy(&fRequestLock);
|
benaphore_destroy(&fRequestLock);
|
||||||
}
|
}
|
||||||
@@ -497,10 +494,6 @@ Inode::WriteBufferToChain(const void *buffer, size_t *_bufferSize, bool nonBlock
|
|||||||
|
|
||||||
chain = cbuf_merge_chains(fBufferChain, chain);
|
chain = cbuf_merge_chains(fBufferChain, chain);
|
||||||
|
|
||||||
// let waiting readers go on
|
|
||||||
// if (fBufferChain == NULL)
|
|
||||||
// release_sem(ReadLock());
|
|
||||||
|
|
||||||
fBufferChain = chain;
|
fBufferChain = chain;
|
||||||
*_bufferSize = bufferSize;
|
*_bufferSize = bufferSize;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user