Patched in Tegra support.

1 files changed, 118 insertions, 74 deletions

diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index 76c144b3c9b..439b61c0326 100644
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -238,10 +238,6 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
         unsigned int x;
         int error;
 
-        error = gfs2_rindex_update(sdp);
-        if (error)
-                return error;
-
         if (GFS2_EA_IS_STUFFED(ea))
                 return 0;
 
@@ -255,7 +251,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
         if (!blks)
                 return 0;
 
-        rgd = gfs2_blk2rgrpd(sdp, bn, 1);
+        rgd = gfs2_blk2rgrpd(sdp, bn);
         if (!rgd) {
                 gfs2_consist_inode(ip);
                 return -EIO;
@@ -325,20 +321,29 @@ static int ea_remove_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
                                struct gfs2_ea_header *ea,
                                struct gfs2_ea_header *prev, int leave)
 {
+        struct gfs2_alloc *al;
         int error;
 
-        error = gfs2_rindex_update(GFS2_SB(&ip->i_inode));
-        if (error)
-                return error;
+        al = gfs2_alloc_get(ip);
+        if (!al)
+                return -ENOMEM;
 
         error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
         if (error)
                 goto out_alloc;
 
+        error = gfs2_rindex_hold(GFS2_SB(&ip->i_inode), &al->al_ri_gh);
+        if (error)
+                goto out_quota;
+
         error = ea_dealloc_unstuffed(ip, bh, ea, prev, (leave) ? &error : NULL);
 
+        gfs2_glock_dq_uninit(&al->al_ri_gh);
+
+out_quota:
         gfs2_quota_unhold(ip);
 out_alloc:
+        gfs2_alloc_put(ip);
         return error;
 }
 
@@ -448,18 +453,17 @@ ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
 }
 
 /**
- * ea_iter_unstuffed - copies the unstuffed xattr data to/from the
- *                     request buffer
+ * ea_get_unstuffed - actually copies the unstuffed data into the
+ *                    request buffer
  * @ip: The GFS2 inode
  * @ea: The extended attribute header structure
- * @din: The data to be copied in
- * @dout: The data to be copied out (one of din,dout will be NULL)
+ * @data: The data to be copied
  *
  * Returns: errno
  */
 
-static int gfs2_iter_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
-                               const char *din, char *dout)
+static int ea_get_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
+                            char *data)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
         struct buffer_head **bh;
@@ -468,8 +472,6 @@ static int gfs2_iter_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
         __be64 *dataptrs = GFS2_EA2DATAPTRS(ea);
         unsigned int x;
         int error = 0;
-        unsigned char *pos;
-        unsigned cp_size;
 
         bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_NOFS);
         if (!bh)
@@ -500,21 +502,12 @@ static int gfs2_iter_unstuffed(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
                         goto out;
                 }
 
-                pos = bh[x]->b_data + sizeof(struct gfs2_meta_header);
-                cp_size = (sdp->sd_jbsize > amount) ? amount : sdp->sd_jbsize;
-
-                if (dout) {
-                        memcpy(dout, pos, cp_size);
-                        dout += sdp->sd_jbsize;
-                }
-
-                if (din) {
-                        gfs2_trans_add_bh(ip->i_gl, bh[x], 1);
-                        memcpy(pos, din, cp_size);
-                        din += sdp->sd_jbsize;
-                }
+                memcpy(data, bh[x]->b_data + sizeof(struct gfs2_meta_header),
+                       (sdp->sd_jbsize > amount) ? amount : sdp->sd_jbsize);
 
                 amount -= sdp->sd_jbsize;
+                data += sdp->sd_jbsize;
+
                 brelse(bh[x]);
         }
 
@@ -535,7 +528,7 @@ static int gfs2_ea_get_copy(struct gfs2_inode *ip, struct gfs2_ea_location *el,
                 memcpy(data, GFS2_EA2DATA(el->el_ea), len);
                 return len;
         }
-        ret = gfs2_iter_unstuffed(ip, el->el_ea, NULL, data);
+        ret = ea_get_unstuffed(ip, el->el_ea, data);
         if (ret < 0)
                 return ret;
         return len;
@@ -563,10 +556,9 @@ int gfs2_xattr_acl_get(struct gfs2_inode *ip, const char *name, char **ppdata)
                 goto out;
 
         error = gfs2_ea_get_copy(ip, &el, data, len);
-        if (error < 0)
-                kfree(data);
-        else
-                *ppdata = data;
+        if (error == 0)
+                error = len;
+        *ppdata = data;
 out:
         brelse(el.el_bh);
         return error;
@@ -624,7 +616,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp)
         u64 block;
         int error;
 
-        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
+        error = gfs2_alloc_block(ip, &block, &n);
         if (error)
                 return error;
         gfs2_trans_add_unrevoke(sdp, block, 1);
@@ -686,7 +678,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
                         int mh_size = sizeof(struct gfs2_meta_header);
                         unsigned int n = 1;
 
-                        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
+                        error = gfs2_alloc_block(ip, &block, &n);
                         if (error)
                                 return error;
                         gfs2_trans_add_unrevoke(sdp, block, 1);
@@ -723,23 +715,26 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er,
                              unsigned int blks,
                              ea_skeleton_call_t skeleton_call, void *private)
 {
+        struct gfs2_alloc *al;
         struct buffer_head *dibh;
         int error;
 
-        error = gfs2_rindex_update(GFS2_SB(&ip->i_inode));
-        if (error)
-                return error;
+        al = gfs2_alloc_get(ip);
+        if (!al)
+                return -ENOMEM;
 
         error = gfs2_quota_lock_check(ip);
         if (error)
-                return error;
+                goto out;
+
+        al->al_requested = blks;
 
-        error = gfs2_inplace_reserve(ip, blks, 0);
+        error = gfs2_inplace_reserve(ip);
         if (error)
                 goto out_gunlock_q;
 
         error = gfs2_trans_begin(GFS2_SB(&ip->i_inode),
-                                 blks + gfs2_rg_blocks(ip, blks) +
+                                 blks + gfs2_rg_blocks(al) +
                                  RES_DINODE + RES_STATFS + RES_QUOTA, 0);
         if (error)
                 goto out_ipres;
@@ -762,6 +757,8 @@ out_ipres:
         gfs2_inplace_release(ip);
 out_gunlock_q:
         gfs2_quota_unlock(ip);
+out:
+        gfs2_alloc_put(ip);
         return error;
 }
 
@@ -1001,7 +998,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er,
         } else {
                 u64 blk;
                 unsigned int n = 1;
-                error = gfs2_alloc_blocks(ip, &blk, &n, 0, NULL);
+                error = gfs2_alloc_block(ip, &blk, &n);
                 if (error)
                         return error;
                 gfs2_trans_add_unrevoke(sdp, blk, 1);
@@ -1232,29 +1229,74 @@ static int gfs2_xattr_set(struct dentry *dentry, const char *name,
                                 size, flags, type);
 }
 
-
 static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip,
                                   struct gfs2_ea_header *ea, char *data)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+        struct buffer_head **bh;
         unsigned int amount = GFS2_EA_DATA_LEN(ea);
         unsigned int nptrs = DIV_ROUND_UP(amount, sdp->sd_jbsize);
-        int ret;
+        __be64 *dataptrs = GFS2_EA2DATAPTRS(ea);
+        unsigned int x;
+        int error;
 
-        ret = gfs2_trans_begin(sdp, nptrs + RES_DINODE, 0);
-        if (ret)
-                return ret;
+        bh = kcalloc(nptrs, sizeof(struct buffer_head *), GFP_NOFS);
+        if (!bh)
+                return -ENOMEM;
 
-        ret = gfs2_iter_unstuffed(ip, ea, data, NULL);
-        gfs2_trans_end(sdp);
+        error = gfs2_trans_begin(sdp, nptrs + RES_DINODE, 0);
+        if (error)
+                goto out;
+
+        for (x = 0; x < nptrs; x++) {
+                error = gfs2_meta_read(ip->i_gl, be64_to_cpu(*dataptrs), 0,
+                                       bh + x);
+                if (error) {
+                        while (x--)
+                                brelse(bh[x]);
+                        goto fail;
+                }
+                dataptrs++;
+        }
 
-        return ret;
+        for (x = 0; x < nptrs; x++) {
+                error = gfs2_meta_wait(sdp, bh[x]);
+                if (error) {
+                        for (; x < nptrs; x++)
+                                brelse(bh[x]);
+                        goto fail;
+                }
+                if (gfs2_metatype_check(sdp, bh[x], GFS2_METATYPE_ED)) {
+                        for (; x < nptrs; x++)
+                                brelse(bh[x]);
+                        error = -EIO;
+                        goto fail;
+                }
+
+                gfs2_trans_add_bh(ip->i_gl, bh[x], 1);
+
+                memcpy(bh[x]->b_data + sizeof(struct gfs2_meta_header), data,
+                       (sdp->sd_jbsize > amount) ? amount : sdp->sd_jbsize);
+
+                amount -= sdp->sd_jbsize;
+                data += sdp->sd_jbsize;
+
+                brelse(bh[x]);
+        }
+
+out:
+        kfree(bh);
+        return error;
+
+fail:
+        gfs2_trans_end(sdp);
+        kfree(bh);
+        return error;
 }
 
 int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data)
 {
-        struct inode *inode = &ip->i_inode;
-        struct gfs2_sbd *sdp = GFS2_SB(inode);
+        struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
         struct gfs2_ea_location el;
         int error;
 
@@ -1277,7 +1319,7 @@ int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data)
         if (error)
                 return error;
 
-        error = gfs2_setattr_simple(inode, attr);
+        error = gfs2_setattr_simple(ip, attr);
         gfs2_trans_end(sdp);
         return error;
 }
@@ -1295,10 +1337,6 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
         unsigned int x;
         int error;
 
-        error = gfs2_rindex_update(sdp);
-        if (error)
-                return error;
-
         memset(&rlist, 0, sizeof(struct gfs2_rgrp_list));
 
         error = gfs2_meta_read(ip->i_gl, ip->i_eattr, DIO_WAIT, &indbh);
@@ -1324,14 +1362,14 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
                         blen++;
                 else {
                         if (bstart)
-                                gfs2_rlist_add(ip, &rlist, bstart);
+                                gfs2_rlist_add(sdp, &rlist, bstart);
                         bstart = bn;
                         blen = 1;
                 }
                 blks++;
         }
         if (bstart)
-                gfs2_rlist_add(ip, &rlist, bstart);
+                gfs2_rlist_add(sdp, &rlist, bstart);
         else
                 goto out;
 
@@ -1403,22 +1441,19 @@ out:
 static int ea_dealloc_block(struct gfs2_inode *ip)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+        struct gfs2_alloc *al = ip->i_alloc;
         struct gfs2_rgrpd *rgd;
         struct buffer_head *dibh;
-        struct gfs2_holder gh;
         int error;
 
-        error = gfs2_rindex_update(sdp);
-        if (error)
-                return error;
-
-        rgd = gfs2_blk2rgrpd(sdp, ip->i_eattr, 1);
+        rgd = gfs2_blk2rgrpd(sdp, ip->i_eattr);
         if (!rgd) {
                 gfs2_consist_inode(ip);
                 return -EIO;
         }
 
-        error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &gh);
+        error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0,
+                                   &al->al_rgd_gh);
         if (error)
                 return error;
 
@@ -1442,7 +1477,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
         gfs2_trans_end(sdp);
 
 out_gunlock:
-        gfs2_glock_dq_uninit(&gh);
+        gfs2_glock_dq_uninit(&al->al_rgd_gh);
         return error;
 }
 
@@ -1455,30 +1490,39 @@ out_gunlock:
 
 int gfs2_ea_dealloc(struct gfs2_inode *ip)
 {
+        struct gfs2_alloc *al;
         int error;
 
-        error = gfs2_rindex_update(GFS2_SB(&ip->i_inode));
-        if (error)
-                return error;
+        al = gfs2_alloc_get(ip);
+        if (!al)
+                return -ENOMEM;
 
         error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
         if (error)
-                return error;
+                goto out_alloc;
 
-        error = ea_foreach(ip, ea_dealloc_unstuffed, NULL);
+        error = gfs2_rindex_hold(GFS2_SB(&ip->i_inode), &al->al_ri_gh);
         if (error)
                 goto out_quota;
 
+        error = ea_foreach(ip, ea_dealloc_unstuffed, NULL);
+        if (error)
+                goto out_rindex;
+
         if (ip->i_diskflags & GFS2_DIF_EA_INDIRECT) {
                 error = ea_dealloc_indirect(ip);
                 if (error)
-                        goto out_quota;
+                        goto out_rindex;
         }
 
         error = ea_dealloc_block(ip);
 
+out_rindex:
+        gfs2_glock_dq_uninit(&al->al_ri_gh);
 out_quota:
         gfs2_quota_unhold(ip);
+out_alloc:
+        gfs2_alloc_put(ip);
         return error;
 }