9 files changed, 39 insertions, 39 deletions

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 1a349f9a9685..5d4261ff5d23 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -2100,8 +2100,13 @@ int gfs2_diradd_alloc_required(struct inode *inode, const struct qstr *name,
         }
         if (IS_ERR(dent))
                 return PTR_ERR(dent);
-        da->bh = bh;
-        da->dent = dent;
+
+        if (da->save_loc) {
+                da->bh = bh;
+                da->dent = dent;
+        } else {
+                brelse(bh);
+        }
         return 0;
 }
 
diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index 126c65dda028..e1b309c24dab 100644
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -23,6 +23,7 @@ struct gfs2_diradd {
         unsigned nr_blocks;
         struct gfs2_dirent *dent;
         struct buffer_head *bh;
+        int save_loc;
 };
 
 extern struct inode *gfs2_dir_search(struct inode *dir,
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 7f4ed3daa38c..80dd44dca028 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -914,26 +914,6 @@ out_uninit:
 #ifdef CONFIG_GFS2_FS_LOCKING_DLM
 
 /**
- * gfs2_setlease - acquire/release a file lease
- * @file: the file pointer
- * @arg: lease type
- * @fl: file lock
- *
- * We don't currently have a way to enforce a lease across the whole
- * cluster; until we do, disable leases (by just returning -EINVAL),
- * unless the administrator has requested purely local locking.
- *
- * Locking: called under i_lock
- *
- * Returns: errno
- */
-
-static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)
-{
-        return -EINVAL;
-}
-
-/**
  * gfs2_lock - acquire/release a posix lock on a file
  * @file: the file pointer
  * @cmd: either modify or retrieve lock state, possibly wait
@@ -1078,7 +1058,7 @@ const struct file_operations gfs2_file_fops = {
         .flock          = gfs2_flock,
         .splice_read    = generic_file_splice_read,
         .splice_write   = iter_file_splice_write,
-        .setlease       = gfs2_setlease,
+        .setlease       = simple_nosetlease,
         .fallocate      = gfs2_fallocate,
 };
 
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 7f513b1ceb2c..8f0c19d1d943 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -811,7 +811,7 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags,
 {
         INIT_LIST_HEAD(&gh->gh_list);
         gh->gh_gl = gl;
-        gh->gh_ip = (unsigned long)__builtin_return_address(0);
+        gh->gh_ip = _RET_IP_;
         gh->gh_owner_pid = get_pid(task_pid(current));
         gh->gh_state = state;
         gh->gh_flags = flags;
@@ -835,7 +835,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder *
         gh->gh_state = state;
         gh->gh_flags = flags;
         gh->gh_iflags = 0;
-        gh->gh_ip = (unsigned long)__builtin_return_address(0);
+        gh->gh_ip = _RET_IP_;
         if (gh->gh_owner_pid)
                 put_pid(gh->gh_owner_pid);
         gh->gh_owner_pid = get_pid(task_pid(current));
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 2ffc67dce87f..1cc0bba6313f 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -93,7 +93,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
          * tr->alloced is not set since the transaction structure is
          * on the stack */
         tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));
-        tr.tr_ip = (unsigned long)__builtin_return_address(0);
+        tr.tr_ip = _RET_IP_;
         sb_start_intwrite(sdp->sd_vfs);
         if (gfs2_log_reserve(sdp, tr.tr_reserved) < 0) {
                 sb_end_intwrite(sdp->sd_vfs);
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 8108b4f0354c..c4ed823d150e 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -600,7 +600,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
         int error, free_vfs_inode = 0;
         u32 aflags = 0;
         unsigned blocks = 1;
-        struct gfs2_diradd da = { .bh = NULL, };
+        struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };
 
         if (!name->len || name->len > GFS2_FNAMESIZE)
                 return -ENAMETOOLONG;
@@ -672,6 +672,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
         gfs2_set_inode_blocks(inode, 1);
         munge_mode_uid_gid(dip, inode);
+        check_and_update_goal(dip);
         ip->i_goal = dip->i_goal;
         ip->i_diskflags = 0;
         ip->i_eattr = 0;
@@ -899,7 +900,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
         struct gfs2_inode *ip = GFS2_I(inode);
         struct gfs2_holder ghs[2];
         struct buffer_head *dibh;
-        struct gfs2_diradd da = { .bh = NULL, };
+        struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };
         int error;
 
         if (S_ISDIR(inode->i_mode))
@@ -1342,7 +1343,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
         struct gfs2_rgrpd *nrgd;
         unsigned int num_gh;
         int dir_rename = 0;
-        struct gfs2_diradd da = { .nr_blocks = 0, };
+        struct gfs2_diradd da = { .nr_blocks = 0, .save_loc = 0, };
         unsigned int x;
         int error;
 
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index f4cb9c0d6bbd..7474c413ffd1 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -577,6 +577,13 @@ struct gfs2_rgrpd *gfs2_rgrpd_get_next(struct gfs2_rgrpd *rgd)
         return rgd;
 }
 
+void check_and_update_goal(struct gfs2_inode *ip)
+{
+        struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+        if (!ip->i_goal || gfs2_blk2rgrpd(sdp, ip->i_goal, 1) == NULL)
+                ip->i_goal = ip->i_no_addr;
+}
+
 void gfs2_free_clones(struct gfs2_rgrpd *rgd)
 {
         int x;
@@ -1910,6 +1917,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, const struct gfs2_alloc_parms *a
         } else if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal)) {
                 rs->rs_rbm.rgd = begin = ip->i_rgd;
         } else {
+                check_and_update_goal(ip);
                 rs->rs_rbm.rgd = begin = gfs2_blk2rgrpd(sdp, ip->i_goal, 1);
         }
         if (S_ISDIR(ip->i_inode.i_mode) && (ap->aflags & GFS2_AF_ORLOV))
@@ -2089,7 +2097,7 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
                                      u32 blen, unsigned char new_state)
 {
         struct gfs2_rbm rbm;
-        struct gfs2_bitmap *bi;
+        struct gfs2_bitmap *bi, *bi_prev = NULL;
 
         rbm.rgd = gfs2_blk2rgrpd(sdp, bstart, 1);
         if (!rbm.rgd) {
@@ -2098,18 +2106,22 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
                 return NULL;
         }
 
+        gfs2_rbm_from_block(&rbm, bstart);
         while (blen--) {
-                gfs2_rbm_from_block(&rbm, bstart);
                 bi = rbm_bi(&rbm);
-                bstart++;
-                if (!bi->bi_clone) {
-                        bi->bi_clone = kmalloc(bi->bi_bh->b_size,
-                                               GFP_NOFS | __GFP_NOFAIL);
-                        memcpy(bi->bi_clone + bi->bi_offset,
-                               bi->bi_bh->b_data + bi->bi_offset, bi->bi_len);
+                if (bi != bi_prev) {
+                        if (!bi->bi_clone) {
+                                bi->bi_clone = kmalloc(bi->bi_bh->b_size,
+                                                      GFP_NOFS | __GFP_NOFAIL);
+                                memcpy(bi->bi_clone + bi->bi_offset,
+                                       bi->bi_bh->b_data + bi->bi_offset,
+                                       bi->bi_len);
+                        }
+                        gfs2_trans_add_meta(rbm.rgd->rd_gl, bi->bi_bh);
+                        bi_prev = bi;
                 }
-                gfs2_trans_add_meta(rbm.rgd->rd_gl, bi->bi_bh);
                 gfs2_setbit(&rbm, false, new_state);
+                gfs2_rbm_incr(&rbm);
         }
 
         return rbm.rgd;
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
index 463ab2e95d1c..5d8f085f7ade 100644
--- a/fs/gfs2/rgrp.h
+++ b/fs/gfs2/rgrp.h
@@ -80,4 +80,5 @@ static inline bool gfs2_rs_active(struct gfs2_blkreserv *rs)
         return rs && !RB_EMPTY_NODE(&rs->rs_node);
 }
 
+extern void check_and_update_goal(struct gfs2_inode *ip);
 #endif /* __RGRP_DOT_H__ */
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 0546ab4e28e8..42bfd3361979 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -44,7 +44,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
         if (!tr)
                 return -ENOMEM;
 
-        tr->tr_ip = (unsigned long)__builtin_return_address(0);
+        tr->tr_ip = _RET_IP_;
         tr->tr_blocks = blocks;
         tr->tr_revokes = revokes;
         tr->tr_reserved = 1;