diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /fs/buffer.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 6ca6f166b..c5cedb6e3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1880,8 +1880,8 @@ int block_truncate_page(struct address_space *mapping, loff_t from, get_block_t iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); page = grab_cache_page(mapping, index); - err = PTR_ERR(page); - if (IS_ERR(page)) + err = -ENOMEM; + if (!page) goto out; if (!page->buffers) @@ -2750,7 +2750,7 @@ int kupdate(void *sem) tsk->session = 1; tsk->pgrp = 1; - strcpy(tsk->comm, "kupdate"); + strcpy(tsk->comm, "kupdated"); /* sigstop and sigcont will stop and wakeup kupdate */ spin_lock_irq(&tsk->sigmask_lock); |