[GFS2] Use vmalloc() in dir code

When allocating memory to sort directory entries, use vmalloc()
rather than kmalloc() since for larger directories, the required
size can easily be graeter than the 128k maximum of kmalloc().

Also adding the first steps towards getting the AOP_TRUNCATED_PAGE
return code get in the glock code by flagging all places where we
request a glock and we are holding a page lock.

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

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index fe6c5adc5df02e8fdcaa70a8863b791180d421dc..eb68cdd41d481707d726aa5a67411d84cb2127c9 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -61,6 +61,7 @@
 #include <linux/sort.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/vmalloc.h>
 #include <asm/semaphore.h>
 
 #include "gfs2.h"
@@ -1290,7 +1291,7 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque,
                return 0;
 
        error = -ENOMEM;
-       larr = kmalloc((leaves + entries) * sizeof(void*), GFP_KERNEL);
+       larr = vmalloc((leaves + entries) * sizeof(void*));
        if (!larr)
                goto out;
        darr = (const struct gfs2_dirent **)(larr + leaves);
@@ -1323,7 +1324,7 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque,
 out_kfree:
        for(i = 0; i < leaf; i++)
                brelse(larr[i]);
-       kfree(larr);
+       vfree(larr);
 out:
        return error;
 }

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 6a1b42cf4df409deabdaef99783011f51a8ae2a5..4ed13787b7ec3f02ebe220212840e02caeff2d40 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -461,6 +461,9 @@ static void handle_recurse(struct gfs2_holder *gh)
        struct gfs2_holder *tmp_gh, *safe;
        int found = 0;
 
+       printk(KERN_INFO "recursion %016llx, %u\n", gl->gl_name.ln_number,
+               gl->gl_name.ln_type);
+
        if (gfs2_assert_warn(sdp, gh->gh_owner))
                return;
 

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 560029de8d0782ee1a27f4d25c27d7070972bbd7..b6646e7fed153bfc1cc684ea90eea3fa8d73dba5 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -27,6 +27,7 @@
 #define GL_SYNC                        0x00000800
 #define GL_NOCANCEL            0x00001000
 #define GL_NEVER_RECURSE       0x00002000
+#define GL_AOP                 0x00004000
 
 #define GLR_TRYFAILED          13
 #define GLR_CANCELED           14

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index dfed83b37ab70de6d14c67027f02dd8eb6199f99..761f00153d43b63164ffb0c58de6235d4b3f61e9 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -156,7 +156,7 @@ struct gfs2_holder {
        struct gfs2_glock *gh_gl;
        struct task_struct *gh_owner;
        unsigned int gh_state;
-       int gh_flags;
+       unsigned gh_flags;
 
        int gh_error;
        unsigned long gh_iflags;

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 4a6aacf294d5a3b5b7573ce2313b096d62288b72..74cf28e77b4724b0cf699532178780a76c8de3fd 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -881,7 +881,7 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp)
                gfs2_ail1_start(sdp, DIO_ALL);
                if (gfs2_ail1_empty(sdp, DIO_ALL))
                        break;
-               msleep(100);
+               msleep(10);
        }
 }
 

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index 3fd8c6ec256cc4b692a88e4a1db01d69c57d8bb5..005c2522a879b4e0a4abb1589909c6aa33d1b82f 100644 (file)
--- a/fs/gfs2/ops_address.c
+++ b/fs/gfs2/ops_address.c
@@ -216,7 +216,7 @@ static int gfs2_readpage(struct file *file, struct page *page)
        int error;
 
        if (file != &gfs2_internal_file_sentinal) {
-               gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
+               gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
                error = gfs2_glock_nq_m_atime(1, &gh);
                if (error)
                        goto out_unlock;
@@ -267,7 +267,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
        loff_t end = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
        struct gfs2_alloc *al;
 
-       gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &ip->i_gh);
+       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;

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 1e2b709711aed7bd5e7cff127fa2000ff1b1a391..62a12a59d91b6ca079346d19620063a151e4eabb 100644 (file)
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -742,8 +742,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (error)
                        goto out_gunlock_q;
 
-               error = gfs2_trans_begin(sdp,
-                                        sdp->sd_max_dirres +
+               error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
                                         al->al_rgd->rd_ri.ri_length +
                                         4 * RES_DINODE + 4 * RES_LEAF +
                                         RES_UNLINKED + RES_STATFS +

diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 80ce40c1dfb618f248d7be95039d80a1c5f7fa8f..60bf2563c7b4a4a241ffeb5d00eb7966cbbd1a10 100644 (file)
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -132,9 +132,7 @@ static void gfs2_put_super(struct super_block *sb)
        /*  At this point, we're through participating in the lockspace  */
 
        gfs2_sys_fs_del(sdp);
-
        vfree(sdp);
-
        sb->s_fs_info = NULL;
 }