JFS: zero new log pages, etc.

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index b3261576144ceb8d09b6a1894ccd2803f230b83c..4a98b5f997bfd686a309dc6d8a56cf0e832a6a66 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1811,7 +1811,7 @@ static int lbmLogInit(struct jfs_log * log)
                lbuf = kmalloc(sizeof(struct lbuf), GFP_KERNEL);
                if (lbuf == 0)
                        goto error;
-               lbuf->l_ldata = (char *) __get_free_page(GFP_KERNEL);
+               lbuf->l_ldata = (char *) get_zeroed_page(GFP_KERNEL);
                if (lbuf->l_ldata == 0) {
                        kfree(lbuf);
                        goto error;

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 84742dc9c57d2c1499da973db5f99b64fadacca3..a1fe5f0165d4b4080ffc61565be785393059ed0e 100644 (file)
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -341,6 +341,10 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
                }
                mp->data = kmap(mp->page) + page_offset;
        }
+
+       if (new)
+               memset(mp->data, 0, PSIZE);
+
        jfs_info("__get_metapage: returning = 0x%p", mp);
        return mp;
 

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 6550cb0e1a25e0f8eb7545b67b0cb6463334d12e..72ae53817dfd5984c85ec5bf0c397954562ed3c9 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -548,11 +548,11 @@ static void init_once(void *foo, kmem_cache_t * cachep, unsigned long flags)
 
        if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
            SLAB_CTOR_CONSTRUCTOR) {
+               memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
                INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
                init_rwsem(&jfs_ip->rdwrlock);
                init_MUTEX(&jfs_ip->commit_sem);
                init_rwsem(&jfs_ip->xattr_sem);
-               jfs_ip->atlhead = 0;
                jfs_ip->active_ag = -1;
 #ifdef CONFIG_JFS_POSIX_ACL
                jfs_ip->i_acl = JFS_ACL_NOT_CACHED;