[GFS2] Clean up journaled data writing

This patch cleans up the code for writing journaled data into the log.
It also removes the need to allocate a small "tag" structure for each
block written into the log. Instead we just keep count of the outstanding
I/O so that we can be sure that its all been written at the correct time.
Another result of this patch is that a number of ll_rw_block() calls
have become submit_bh() calls, closing some races at the same time.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index dd1ea491ddcb..b7baf1831912 100644
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -414,7 +414,8 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
         if (ind_blocks || data_blocks)
                 rblocks += RES_STATFS + RES_QUOTA;
 
-        error = gfs2_trans_begin(sdp, rblocks, 0);
+        error = gfs2_trans_begin(sdp, rblocks,
+                                 PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);
         if (error)
                 goto out_trans_fail;
 
@@ -625,10 +626,10 @@ 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)) {
-                        if (!buffer_pinned(bh))
-                                list_del_init(&bd->bd_le.le_list);
-                }
+                if (!list_empty(&bd->bd_le.le_list) && !buffer_pinned(bh))
+                        list_del_init(&bd->bd_le.le_list);
+                else
+                        gfs2_remove_from_journal(bh, current->journal_info, 0);
         }
         bh->b_bdev = NULL;
         clear_buffer_mapped(bh);