diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /net/khttpd | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'net/khttpd')
| -rw-r--r-- | net/khttpd/datasending.c | 3 | ||||
| -rw-r--r-- | net/khttpd/structure.h | 2 | ||||
| -rw-r--r-- | net/khttpd/userspace.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/net/khttpd/datasending.c b/net/khttpd/datasending.c index 058b308dc..a26afe191 100644 --- a/net/khttpd/datasending.c +++ b/net/khttpd/datasending.c @@ -114,8 +114,7 @@ int DataSending(const int CPUNR) inode = CurrentRequest->filp->f_dentry->d_inode; - if ( (inode!=NULL)&&(inode->i_op!=NULL)&&(inode->i_op->readpage!=NULL)) - { + if (inode && inode->i_mapping->a_ops->readpage) { /* This does the actual transfer using sendfile */ read_descriptor_t desc; loff_t *ppos; diff --git a/net/khttpd/structure.h b/net/khttpd/structure.h index 70a604aba..5f6f2a619 100644 --- a/net/khttpd/structure.h +++ b/net/khttpd/structure.h @@ -42,7 +42,7 @@ struct http_request char LengthS[14]; /* File length, string representation */ char *MimeType; /* Pointer to a string with the mime-type based on the filename */ - int MimeLength; /* The length of this string */ + __kernel_size_t MimeLength; /* The length of this string */ }; diff --git a/net/khttpd/userspace.c b/net/khttpd/userspace.c index 948d770fe..9c05d4788 100644 --- a/net/khttpd/userspace.c +++ b/net/khttpd/userspace.c @@ -216,10 +216,10 @@ static int AddSocketToAcceptQueue(struct socket *sock,const int Port) sock->state = SS_UNCONNECTED; req->class = &Dummy; - write_lock_irq(&nsk->callback_lock); + write_lock_bh(&nsk->callback_lock); nsk->socket = NULL; nsk->sleep = NULL; - write_unlock_irq(&nsk->callback_lock); + write_unlock_bh(&nsk->callback_lock); tcp_acceptq_queue(sk, req, nsk); |