diff options
| author | davem <davem> | 2001-10-27 15:24:43 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-10-27 15:24:43 +0000 |
| commit | 22e96218e8930c871ea43c64e903cf436feb80ae (patch) | |
| tree | f058f3300784c5ffb72c2c3c4381a4f778039d5e /include | |
| parent | ae29d82ab3eaad8a732cb6d4e6db80d2429e7cc7 (diff) | |
| download | netdev-vger-cvs-22e96218e8930c871ea43c64e903cf436feb80ae.tar.gz | |
Merge mainline to 2.4.14-pre3
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 9 | ||||
| -rw-r--r-- | include/linux/pagemap.h | 1 | ||||
| -rw-r--r-- | include/linux/swap.h | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index c62eaeea7..9dbef2980 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -66,14 +66,17 @@ typedef void (unplug_device_fn) (void *q); */ #define QUEUE_NR_REQUESTS 8192 +struct request_list { + unsigned int count; + struct list_head free; +}; + struct request_queue { /* * the queue request freelist, one for reads and one for writes */ - struct list_head request_freelist[2]; - struct list_head pending_freelist[2]; - int pending_free[2]; + struct request_list rq[2]; /* * Together with queue_head for cacheline sharing diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 5007df973..1fda6fa35 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -82,6 +82,7 @@ extern struct page * find_or_create_page(struct address_space *mapping, extern void lock_page(struct page *page); #define find_lock_page(mapping, index) \ __find_lock_page(mapping, index, page_hash(mapping, index)) +extern struct page *find_trylock_page(struct address_space *, unsigned long); extern void add_to_page_cache(struct page * page, struct address_space *mapping, unsigned long index); extern void add_to_page_cache_locked(struct page * page, struct address_space *mapping, unsigned long index); diff --git a/include/linux/swap.h b/include/linux/swap.h index 34f693fe8..ffa813443 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -145,6 +145,7 @@ extern int swap_duplicate(swp_entry_t); extern int swap_count(struct page *); extern int valid_swaphandles(swp_entry_t, unsigned long *); extern void swap_free(swp_entry_t); +extern void free_swap_and_cache(swp_entry_t); struct swap_list_t { int head; /* head of priority-ordered swapfile list */ int next; /* swapfile to be used next */ |