diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /net/khttpd | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'net/khttpd')
| -rw-r--r-- | net/khttpd/main.c | 3 | ||||
| -rw-r--r-- | net/khttpd/security.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/khttpd/main.c b/net/khttpd/main.c index 418037907..a9568ef0d 100644 --- a/net/khttpd/main.c +++ b/net/khttpd/main.c @@ -198,7 +198,6 @@ static int ManagementDaemon(void *unused) DECLARE_WAIT_QUEUE_HEAD(WQ); - MOD_INC_USE_COUNT; sprintf(current->comm,"khttpd manager"); lock_kernel(); /* This seems to be required for exit_mm */ @@ -347,6 +346,8 @@ static int ManagementDaemon(void *unused) int __init khttpd_init(void) { int I; + + MOD_INC_USE_COUNT; I=0; while (I<CONFIG_KHTTPD_NUMCPU) diff --git a/net/khttpd/security.c b/net/khttpd/security.c index bd578941d..7e0780a26 100644 --- a/net/khttpd/security.c +++ b/net/khttpd/security.c @@ -113,10 +113,11 @@ struct file *OpenFileForSecurity(char *Filename) #endif /* Rule no. 3 -- Does the file exist ? */ - + lock_kernel(); filp = filp_open(Filename, 0, O_RDONLY, NULL); + unlock_kernel(); if ((IS_ERR(filp))||(filp==NULL)||(filp->f_dentry==NULL)) { |