Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus

[linux-2.6-microblaze.git] / fs / gfs2 / aops.c

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 9b2ff0e..e80a464 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -36,8 +36,8 @@
 #include "glops.h"
 
 
-void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
-                           unsigned int from, unsigned int to)
+static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
+                                  unsigned int from, unsigned int to)
 {
        struct buffer_head *head = page_buffers(page);
        unsigned int bsize = head->b_size;
@@ -517,15 +517,14 @@ out:
 /**
  * gfs2_internal_read - read an internal file
  * @ip: The gfs2 inode
- * @ra_state: The readahead state (or NULL for no readahead)
  * @buf: The buffer to fill
  * @pos: The file position
  * @size: The amount to read
  *
  */
 
-int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
-                       char *buf, loff_t *pos, unsigned size)
+int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos,
+                       unsigned size)
 {
        struct address_space *mapping = ip->i_inode.i_mapping;
        unsigned long index = *pos / PAGE_CACHE_SIZE;
@@ -943,8 +942,8 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
        clear_buffer_dirty(bh);
        bd = bh->b_private;
        if (bd) {
-               if (!list_empty(&bd->bd_le.le_list) && !buffer_pinned(bh))
-                       list_del_init(&bd->bd_le.le_list);
+               if (!list_empty(&bd->bd_list) && !buffer_pinned(bh))
+                       list_del_init(&bd->bd_list);
                else
                        gfs2_remove_from_journal(bh, current->journal_info, 0);
        }
@@ -1084,10 +1083,9 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
                bd = bh->b_private;
                if (bd) {
                        gfs2_assert_warn(sdp, bd->bd_bh == bh);
-                       gfs2_assert_warn(sdp, list_empty(&bd->bd_list_tr));
-                       if (!list_empty(&bd->bd_le.le_list)) {
+                       if (!list_empty(&bd->bd_list)) {
                                if (!buffer_pinned(bh))
-                                       list_del_init(&bd->bd_le.le_list);
+                                       list_del_init(&bd->bd_list);
                                else
                                        bd = NULL;
                        }