Linux 2.2.13pre3

o	Fix the buffer leak			(Dave Miller)

diff --git a/Makefile b/Makefile
index 7e5be0f05e945f234b36d414e9d38b949a2728c0..5efbbefec5edfaf58a9b362411559f0cd0fb6454 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 13
-EXTRAVERSION = pre2
+EXTRAVERSION = pre3
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2fd11f7b49648b4f7d136e71a304c0ab425042da..4e05d30e4a11f8f23c477ef29f5c008ee9a36c81 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -184,7 +184,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 +754,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 +774,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 +781,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 +851,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 +866,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);