Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

Pull gfs2 updates from Steven Whitehouse:
 "The main feature of interest this time is quota updates.  There are
  some clean ups and some patches to use the new generic lru list code.

  There is still plenty of scope for some further changes in due course -
  faster lookups of quota structures is very much on the todo list.
  Also, a start has been made towards the more tricky issue of using the
  generic lru code with glocks, but that will have to be completed in a
  subsequent merge window.

  The other, more minor feature, is that there have been a number of
  performance patches which relate to block allocation.  In particular
  they will improve performance when the disk is nearly full"

* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Use generic list_lru for quota
  GFS2: Rename quota qd_lru_lock qd_lock
  GFS2: Use reflink for quota data cache
  GFS2: Use lockref for glocks
  GFS2: Protect quota sync generation
  GFS2: Inline qd_trylock into gfs2_quota_unlock
  GFS2: Make two similar quota code fragments into a function
  GFS2: Remove obsolete quota tunable
  GFS2: Move gfs2_icbit_munge into quota.c
  GFS2: Speed up starting point selection for block allocation
  GFS2: Add allocation parameters structure
  GFS2: Clean up reservation removal
  GFS2: fix dentry leaks
  GFS2: new function gfs2_rbm_incr
  GFS2: Introduce rbm field bii
  GFS2: Do not reset flags on active reservations
  GFS2: introduce bi_blocks for optimization
  GFS2: optimize rbm_from_block wrt bi_start
  GFS2: d_splice_alias() can't return error

1 files changed, 26 insertions, 18 deletions

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index ced3257f06e8..109ce9325b76 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -379,6 +379,7 @@ static void munge_mode_uid_gid(const struct gfs2_inode *dip,
 static int alloc_dinode(struct gfs2_inode *ip, u32 flags)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+        struct gfs2_alloc_parms ap = { .target = RES_DINODE, .aflags = flags, };
         int error;
         int dblocks = 1;
 
@@ -386,7 +387,7 @@ static int alloc_dinode(struct gfs2_inode *ip, u32 flags)
         if (error)
                 goto out;
 
-        error = gfs2_inplace_reserve(ip, RES_DINODE, flags);
+        error = gfs2_inplace_reserve(ip, &ap);
         if (error)
                 goto out_quota;
 
@@ -472,6 +473,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
                        struct gfs2_inode *ip, int arq)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
+        struct gfs2_alloc_parms ap = { .target = sdp->sd_max_dirres, };
         int error;
 
         if (arq) {
@@ -479,7 +481,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
                 if (error)
                         goto fail_quota_locks;
 
-                error = gfs2_inplace_reserve(dip, sdp->sd_max_dirres, 0);
+                error = gfs2_inplace_reserve(dip, &ap);
                 if (error)
                         goto fail_quota_locks;
 
@@ -584,17 +586,17 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
         if (!IS_ERR(inode)) {
                 d = d_splice_alias(inode, dentry);
                 error = 0;
-                if (file && !IS_ERR(d)) {
-                        if (d == NULL)
-                                d = dentry;
-                        if (S_ISREG(inode->i_mode))
-                                error = finish_open(file, d, gfs2_open_common, opened);
-                        else
+                if (file) {
+                        if (S_ISREG(inode->i_mode)) {
+                                WARN_ON(d != NULL);
+                                error = finish_open(file, dentry, gfs2_open_common, opened);
+                        } else {
                                 error = finish_no_open(file, d);
+                        }
+                } else {
+                        dput(d);
                 }
                 gfs2_glock_dq_uninit(ghs);
-                if (IS_ERR(d))
-                        return PTR_ERR(d);
                 return error;
         } else if (error != -ENOENT) {
                 goto fail_gunlock;
@@ -713,7 +715,7 @@ fail_gunlock2:
 fail_free_inode:
         if (ip->i_gl)
                 gfs2_glock_put(ip->i_gl);
-        gfs2_rs_delete(ip);
+        gfs2_rs_delete(ip, NULL);
         free_inode_nonrcu(inode);
         inode = NULL;
 fail_gunlock:
@@ -781,8 +783,10 @@ static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry,
                 error = finish_open(file, dentry, gfs2_open_common, opened);
 
         gfs2_glock_dq_uninit(&gh);
-        if (error)
+        if (error) {
+                dput(d);
                 return ERR_PTR(error);
+        }
         return d;
 }
 
@@ -874,11 +878,12 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
         error = 0;
 
         if (alloc_required) {
+                struct gfs2_alloc_parms ap = { .target = sdp->sd_max_dirres, };
                 error = gfs2_quota_lock_check(dip);
                 if (error)
                         goto out_gunlock;
 
-                error = gfs2_inplace_reserve(dip, sdp->sd_max_dirres, 0);
+                error = gfs2_inplace_reserve(dip, &ap);
                 if (error)
                         goto out_gunlock_q;
 
@@ -1163,14 +1168,16 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
         d = __gfs2_lookup(dir, dentry, file, opened);
         if (IS_ERR(d))
                 return PTR_ERR(d);
-        if (d == NULL)
-                d = dentry;
-        if (d->d_inode) {
+        if (d != NULL)
+                dentry = d;
+        if (dentry->d_inode) {
                 if (!(*opened & FILE_OPENED))
-                        return finish_no_open(file, d);
+                        return finish_no_open(file, dentry);
+                dput(d);
                 return 0;
         }
 
+        BUG_ON(d != NULL);
         if (!(flags & O_CREAT))
                 return -ENOENT;
 
@@ -1385,11 +1392,12 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                 goto out_gunlock;
 
         if (alloc_required) {
+                struct gfs2_alloc_parms ap = { .target = sdp->sd_max_dirres, };
                 error = gfs2_quota_lock_check(ndip);
                 if (error)
                         goto out_gunlock;
 
-                error = gfs2_inplace_reserve(ndip, sdp->sd_max_dirres, 0);
+                error = gfs2_inplace_reserve(ndip, &ap);
                 if (error)
                         goto out_gunlock_q;