diff options
Diffstat (limited to 'pfinet/linux-src/include/linux/fs.h')
| -rw-r--r-- | pfinet/linux-src/include/linux/fs.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/pfinet/linux-src/include/linux/fs.h b/pfinet/linux-src/include/linux/fs.h index 2fd11f7b..93a39537 100644 --- a/pfinet/linux-src/include/linux/fs.h +++ b/pfinet/linux-src/include/linux/fs.h @@ -22,6 +22,7 @@ #include <asm/atomic.h> #include <linux/bitops.h> #include <asm/cache.h> +#include <linux/stddef.h> /* just in case the #define NULL previously in here was needed */ struct poll_table_struct; @@ -65,10 +66,6 @@ extern int max_super_blocks, nr_super_blocks; #define READA 2 /* read-ahead - don't block if no resources */ #define WRITEA 3 /* write-ahead - don't block if no resources */ -#ifndef NULL -#define NULL ((void *) 0) -#endif - #define NIL_FILP ((struct file *)0) #define SEL_IN 1 #define SEL_OUT 2 @@ -184,7 +181,6 @@ typedef char buffer_block[BLOCK_SIZE]; #define BH_Lock 2 /* 1 if the buffer is locked */ #define BH_Req 3 /* 0 if the buffer has been invalidated */ #define BH_Protected 6 /* 1 if the buffer is protected */ -#define BH_LowPrio 7 /* 1 if the buffer is lowprio */ /* * Try to keep the most commonly used fields in single cache lines (16 @@ -755,7 +751,6 @@ extern struct file *inuse_filps; extern void refile_buffer(struct buffer_head * buf); extern void set_writetime(struct buffer_head * buf, int flag); extern int try_to_free_buffers(struct page *); -extern void cache_drop_behind(struct buffer_head *bh); extern int nr_buffers; extern int buffermem; @@ -776,25 +771,6 @@ extern inline void mark_buffer_clean(struct buffer_head * bh) } } -extern inline void mark_buffer_highprio(struct buffer_head * bh) -{ - clear_bit(BH_LowPrio, &bh->b_state); -} - -extern inline void mark_buffer_lowprio(struct buffer_head * bh) -{ - /* - * dirty buffers cannot be marked lowprio. - */ - if (!buffer_dirty(bh)) - set_bit(BH_LowPrio, &bh->b_state); -} - -static inline int buffer_lowprio(struct buffer_head * bh) -{ - return test_bit(BH_LowPrio, &bh->b_state); -} - extern inline void mark_buffer_dirty(struct buffer_head * bh, int flag) { if (!test_and_set_bit(BH_Dirty, &bh->b_state)) { @@ -802,23 +778,6 @@ extern inline void mark_buffer_dirty(struct buffer_head * bh, int flag) if (bh->b_list != BUF_DIRTY) refile_buffer(bh); } - /* - * if a buffer gets marked dirty then it has to lose - * it's lowprio state. - */ - mark_buffer_highprio(bh); -} - -extern inline void mark_buffer_dirty_lowprio(struct buffer_head * bh) -{ - if (!test_and_set_bit(BH_Dirty, &bh->b_state)) { - if (bh->b_list != BUF_DIRTY) - refile_buffer(bh); - /* - * Mark it lowprio only if it was not dirty before! - */ - set_bit(BH_LowPrio, &bh->b_state); - } } extern int check_disk_change(kdev_t dev); @@ -889,7 +848,6 @@ extern struct buffer_head * getblk(kdev_t, int, int); extern struct buffer_head * find_buffer(kdev_t dev, int block, int size); extern void ll_rw_block(int, int, struct buffer_head * bh[]); extern int is_read_only(kdev_t); -extern int is_device_idle(kdev_t); extern void __brelse(struct buffer_head *); extern inline void brelse(struct buffer_head *buf) { @@ -905,12 +863,8 @@ extern inline void bforget(struct buffer_head *buf) extern void set_blocksize(kdev_t dev, int size); extern unsigned int get_hardblocksize(kdev_t dev); extern struct buffer_head * bread(kdev_t dev, int block, int size); -extern struct buffer_head * buffer_ready (kdev_t dev, int block, int size); -extern void bread_ahead (kdev_t dev, int block, int size); extern struct buffer_head * breada(kdev_t dev,int block, int size, unsigned int pos, unsigned int filesize); -extern struct buffer_head * breada_blocks(kdev_t dev,int block, - int size, int blocks); extern int brw_page(int, struct page *, kdev_t, int [], int, int); |