diff options
| author |   Daniel Robbins <drobbins@gentoo.org> | 2001-11-16 22:58:01 +0000 |
|---|---|---|
| committer | Daniel Robbins <drobbins@gentoo.org> | 2001-11-16 22:58:01 +0000 |
| commit | 7d7caf8076b8af0213f4db7926170d5ab3c78c66 (patch) | |
| tree | ab7d7a67781c4166571ef35eb4baada466563179 /sys-kernel/linux-sources | |
| parent | adding a real portage tbz2 package to cvs (diff) | |
| download | gentoo-2-7d7caf8076b8af0213f4db7926170d5ab3c78c66.tar.gz gentoo-2-7d7caf8076b8af0213f4db7926170d5ab3c78c66.tar.bz2 gentoo-2-7d7caf8076b8af0213f4db7926170d5ab3c78c66.zip | |
ifixo
Diffstat (limited to 'sys-kernel/linux-sources')
| -rw-r--r-- | sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/filemap.c | 11 | ||||
| -rw-r--r-- | sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/sched.h | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/filemap.c b/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/filemap.c index 8c98b0d81bf1..98978f78a711 100644 --- a/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/filemap.c +++ b/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/filemap.c @@ -209,12 +209,21 @@ spin_unlock(&pagecache_lock); spin_unlock(&pagemap_lru_lock); } +static int do_flushpage(struct page *page, unsigned long offset) +{ + int (*flushpage) (struct page *, unsigned long); + flushpage = page->mapping->a_ops->flushpage; + if (flushpage) + return (*flushpage)(page, offset); + return block_flushpage(page, offset); +} + static inline void truncate_partial_page(struct page *page, unsigned partial) { memclear_highpage_flush(page, partial, PAGE_CACHE_SIZE-partial); if (page->buffers) - block_flushpage(page, partial); + do_flushpage(page, partial); } diff --git a/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/sched.h b/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/sched.h index c2e891695008..cac7a8319652 100644 --- a/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/sched.h +++ b/sys-kernel/linux-sources/files/2.4.15pre1aa1-fixes/sched.h @@ -417,6 +417,7 @@ struct task_struct { u32 self_exec_id; /* Protection of (de-)allocation: mm, files, fs, tty */ spinlock_t alloc_lock; + void *journal_info; }; /* @@ -502,7 +503,8 @@ extern struct exec_domain default_exec_domain; sig: &init_signals, \ pending: { NULL, &tsk.pending.head, {{0}}}, \ blocked: {{0}}, \ - alloc_lock: SPIN_LOCK_UNLOCKED \ + alloc_lock: SPIN_LOCK_UNLOCKED, \ + journal_info: NULL } |