Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[pandora-kernel.git] / fs / gfs2 / ops_address.c

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 8b18e97..8d5963c 100644 (file)
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -65,7 +65,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
 int gfs2_get_block(struct inode *inode, sector_t lblock,
                   struct buffer_head *bh_result, int create)
 {
-       return gfs2_block_map(inode, lblock, create, bh_result, 32);
+       return gfs2_block_map(inode, lblock, create, bh_result);
 }
 
 /**
@@ -83,7 +83,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
 {
        int error;
 
-       error = gfs2_block_map(inode, lblock, 0, bh_result, 1);
+       error = gfs2_block_map(inode, lblock, 0, bh_result);
        if (error)
                return error;
        if (bh_result->b_blocknr == 0)
@@ -94,7 +94,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
 static int gfs2_get_block_direct(struct inode *inode, sector_t lblock,
                                 struct buffer_head *bh_result, int create)
 {
-       return gfs2_block_map(inode, lblock, 0, bh_result, 32);
+       return gfs2_block_map(inode, lblock, 0, bh_result);
 }
 
 /**
@@ -162,7 +162,7 @@ static int zero_readpage(struct page *page)
 
        kaddr = kmap_atomic(page, KM_USER0);
        memset(kaddr, 0, PAGE_CACHE_SIZE);
-       kunmap_atomic(page, KM_USER0);
+       kunmap_atomic(kaddr, KM_USER0);
 
        SetPageUptodate(page);
 
@@ -195,7 +195,7 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)
        memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode),
               ip->i_di.di_size);
        memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size);
-       kunmap_atomic(page, KM_USER0);
+       kunmap_atomic(kaddr, KM_USER0);
 
        brelse(dibh);
 
@@ -296,7 +296,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping,
                                 LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh);
                do_unlock = 1;
                ret = gfs2_glock_nq_m_atime(1, &gh);
-               if (ret == GLR_TRYFAILED) 
+               if (ret == GLR_TRYFAILED)
                        goto out_noerror;
                if (unlikely(ret))
                        goto out_unlock;
@@ -370,19 +370,22 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
        loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + from;
        loff_t end = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
        struct gfs2_alloc *al;
+       unsigned int write_len = to - from;
+
 
        gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|GL_AOP, &ip->i_gh);
        error = gfs2_glock_nq_m_atime(1, &ip->i_gh);
        if (error)
                goto out_uninit;
 
-       gfs2_write_calc_reserv(ip, to - from, &data_blocks, &ind_blocks);
+       gfs2_write_calc_reserv(ip, write_len, &data_blocks, &ind_blocks);
 
-       error = gfs2_write_alloc_required(ip, pos, from - to, &alloc_required);
+       error = gfs2_write_alloc_required(ip, pos, write_len, &alloc_required);
        if (error)
                goto out_unlock;
 
 
+       ip->i_alloc.al_requested = 0;
        if (alloc_required) {
                al = gfs2_alloc_get(ip);
 
@@ -460,7 +463,8 @@ static int gfs2_commit_write(struct file *file, struct page *page,
        struct gfs2_sbd *sdp = GFS2_SB(inode);
        int error = -EOPNOTSUPP;
        struct buffer_head *dibh;
-       struct gfs2_alloc *al = &ip->i_alloc;;
+       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_dinode *di;
 
        if (gfs2_assert_withdraw(sdp, gfs2_glock_is_locked_by_me(ip->i_gl)))
                 goto fail_nounlock;
@@ -470,6 +474,7 @@ static int gfs2_commit_write(struct file *file, struct page *page,
                goto fail_endtrans;
 
        gfs2_trans_add_bh(ip->i_gl, dibh, 1);
+       di = (struct gfs2_dinode *)dibh->b_data;
 
        if (gfs2_is_stuffed(ip)) {
                u64 file_size;
@@ -480,7 +485,7 @@ static int gfs2_commit_write(struct file *file, struct page *page,
                kaddr = kmap_atomic(page, KM_USER0);
                memcpy(dibh->b_data + sizeof(struct gfs2_dinode) + from,
                       kaddr + from, to - from);
-               kunmap_atomic(page, KM_USER0);
+               kunmap_atomic(kaddr, KM_USER0);
 
                SetPageUptodate(page);
 
@@ -495,10 +500,16 @@ static int gfs2_commit_write(struct file *file, struct page *page,
                        goto fail;
        }
 
-       if (ip->i_di.di_size < inode->i_size)
+       if (ip->i_di.di_size < inode->i_size) {
                ip->i_di.di_size = inode->i_size;
+               di->di_size = cpu_to_be64(inode->i_size);
+       }
+
+       di->di_mode = cpu_to_be32(inode->i_mode);
+       di->di_atime = cpu_to_be64(inode->i_atime.tv_sec);
+       di->di_mtime = cpu_to_be64(inode->i_mtime.tv_sec);
+       di->di_ctime = cpu_to_be64(inode->i_ctime.tv_sec);
 
-       gfs2_dinode_out(&ip->i_di, dibh->b_data);
        brelse(dibh);
        gfs2_trans_end(sdp);
        if (al->al_requested) {
@@ -681,7 +692,7 @@ static unsigned limit = 0;
 
        gl = bd->bd_gl;
 
-       fs_warn(sdp, "gl = (%u, %llu)\n", 
+       fs_warn(sdp, "gl = (%u, %llu)\n",
                gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number);
 
        fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n",