Merge ../linux-2.6 by hand

6 files changed, 46 insertions, 27 deletions

diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index eadf319bee22..68000a50ceb6 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -74,7 +74,7 @@
 static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno,
                         int nblocks);
 static void dbSplit(dmtree_t * tp, int leafno, int splitsz, int newval);
-static void dbBackSplit(dmtree_t * tp, int leafno);
+static int dbBackSplit(dmtree_t * tp, int leafno);
 static int dbJoin(dmtree_t * tp, int leafno, int newval);
 static void dbAdjTree(dmtree_t * tp, int leafno, int newval);
 static int dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc,
@@ -305,7 +305,6 @@ int dbSync(struct inode *ipbmap)
         filemap_fdatawrite(ipbmap->i_mapping);
         filemap_fdatawait(ipbmap->i_mapping);
 
-        ipbmap->i_state |= I_DIRTY;
         diWriteSpecial(ipbmap, 0);
 
         return (0);
@@ -2467,7 +2466,9 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level)
                  * that it is at the front of a binary buddy system.
                  */
                 if (oldval == NOFREE) {
-                        dbBackSplit((dmtree_t *) dcp, leafno);
+                        rc = dbBackSplit((dmtree_t *) dcp, leafno);
+                        if (rc)
+                                return rc;
                         oldval = dcp->stree[ti];
                 }
                 dbSplit((dmtree_t *) dcp, leafno, dcp->budmin, newval);
@@ -2627,7 +2628,7 @@ static void dbSplit(dmtree_t * tp, int leafno, int splitsz, int newval)
  *
  * serialization: IREAD_LOCK(ipbmap) or IWRITE_LOCK(ipbmap) held on entry/exit;
  */
-static void dbBackSplit(dmtree_t * tp, int leafno)
+static int dbBackSplit(dmtree_t * tp, int leafno)
 {
         int budsz, bud, w, bsz, size;
         int cursz;
@@ -2662,7 +2663,10 @@ static void dbBackSplit(dmtree_t * tp, int leafno)
                  */
                 for (w = leafno, bsz = budsz;; bsz <<= 1,
                      w = (w < bud) ? w : bud) {
-                        assert(bsz < le32_to_cpu(tp->dmt_nleafs));
+                        if (bsz >= le32_to_cpu(tp->dmt_nleafs)) {
+                                jfs_err("JFS: block map error in dbBackSplit");
+                                return -EIO;
+                        }
 
                         /* determine the buddy.
                          */
@@ -2681,7 +2685,11 @@ static void dbBackSplit(dmtree_t * tp, int leafno)
                 }
         }
 
-        assert(leaf[leafno] == size);
+        if (leaf[leafno] != size) {
+                jfs_err("JFS: wrong leaf value in dbBackSplit");
+                return -EIO;
+        }
+        return 0;
 }
 
 
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 4021d46da7e3..28201b194f53 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -57,6 +57,12 @@
 #include "jfs_debug.h"
 
 /*
+ * __mark_inode_dirty expects inodes to be hashed.  Since we don't want
+ * special inodes in the fileset inode space, we hash them to a dummy head
+ */
+static HLIST_HEAD(aggregate_hash);
+
+/*
  * imap locks
  */
 /* iag free list lock */
@@ -491,6 +497,8 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)
         /* release the page */
         release_metapage(mp);
 
+        hlist_add_head(&ip->i_hash, &aggregate_hash);
+
         return (ip);
 }
 
@@ -514,8 +522,6 @@ void diWriteSpecial(struct inode *ip, int secondary)
         ino_t inum = ip->i_ino;
         struct metapage *mp;
 
-        ip->i_state &= ~I_DIRTY;
-
         if (secondary)
                 address = addressPXD(&sbi->ait2) >> sbi->l2nbperpage;
         else
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 13d7e3f1feb4..8a53981f9f27 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -86,7 +86,7 @@ struct meta_anchor {
         atomic_t io_count;
         struct metapage *mp[MPS_PER_PAGE];
 };
-#define mp_anchor(page) ((struct meta_anchor *)page->private)
+#define mp_anchor(page) ((struct meta_anchor *)page_private(page))
 
 static inline struct metapage *page_to_mp(struct page *page, uint offset)
 {
@@ -108,7 +108,7 @@ static inline int insert_metapage(struct page *page, struct metapage *mp)
                 if (!a)
                         return -ENOMEM;
                 memset(a, 0, sizeof(struct meta_anchor));
-                page->private = (unsigned long)a;
+                set_page_private(page, (unsigned long)a);
                 SetPagePrivate(page);
                 kmap(page);
         }
@@ -136,7 +136,7 @@ static inline void remove_metapage(struct page *page, struct metapage *mp)
         a->mp[index] = NULL;
         if (--a->mp_count == 0) {
                 kfree(a);
-                page->private = 0;
+                set_page_private(page, 0);
                 ClearPagePrivate(page);
                 kunmap(page);
         }
@@ -156,13 +156,13 @@ static inline void dec_io(struct page *page, void (*handler) (struct page *))
 #else
 static inline struct metapage *page_to_mp(struct page *page, uint offset)
 {
-        return PagePrivate(page) ? (struct metapage *)page->private : NULL;
+        return PagePrivate(page) ? (struct metapage *)page_private(page) : NULL;
 }
 
 static inline int insert_metapage(struct page *page, struct metapage *mp)
 {
         if (mp) {
-                page->private = (unsigned long)mp;
+                set_page_private(page, (unsigned long)mp);
                 SetPagePrivate(page);
                 kmap(page);
         }
@@ -171,7 +171,7 @@ static inline int insert_metapage(struct page *page, struct metapage *mp)
 
 static inline void remove_metapage(struct page *page, struct metapage *mp)
 {
-        page->private = 0;
+        set_page_private(page, 0);
         ClearPagePrivate(page);
         kunmap(page);
 }
@@ -198,7 +198,7 @@ static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
         }
 }
 
-static inline struct metapage *alloc_metapage(unsigned int gfp_mask)
+static inline struct metapage *alloc_metapage(gfp_t gfp_mask)
 {
         return mempool_alloc(metapage_mempool, gfp_mask);
 }
@@ -395,6 +395,12 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)
 
                 if (mp->nohomeok && !test_bit(META_forcewrite, &mp->flag)) {
                         redirty = 1;
+                        /*
+                         * Make sure this page isn't blocked indefinitely.
+                         * If the journal isn't undergoing I/O, push it
+                         */
+                        if (mp->log && !(mp->log->cflag & logGC_PAGEOUT))
+                                jfs_flush_journal(mp->log, 0);
                         continue;
                 }
 
@@ -534,7 +540,7 @@ add_failed:
         return -EIO;
 }
 
-static int metapage_releasepage(struct page *page, int gfp_mask)
+static int metapage_releasepage(struct page *page, gfp_t gfp_mask)
 {
         struct metapage *mp;
         int busy = 0;
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 9b71ed2674fe..b660c93c92de 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -2396,7 +2396,6 @@ static void txUpdateMap(struct tblock * tblk)
          */
         if (tblk->xflag & COMMIT_CREATE) {
                 diUpdatePMap(ipimap, tblk->ino, FALSE, tblk);
-                ipimap->i_state |= I_DIRTY;
                 /* update persistent block allocation map
                  * for the allocation of inode extent;
                  */
@@ -2407,7 +2406,6 @@ static void txUpdateMap(struct tblock * tblk)
         } else if (tblk->xflag & COMMIT_DELETE) {
                 ip = tblk->u.ip;
                 diUpdatePMap(ipimap, ip->i_ino, TRUE, tblk);
-                ipimap->i_state |= I_DIRTY;
                 iput(ip);
         }
 }
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index a7fe2f2b969f..e72f4ebb6e9c 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -3516,16 +3516,10 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
         /* process entries backward from last index */
         index = le16_to_cpu(p->header.nextindex) - 1;
 
-        if (p->header.flag & BT_INTERNAL)
-                goto getChild;
-
-        /*
-         *      leaf page
-         */
 
-        /* Since this is the rightmost leaf, and we may have already freed
-         * a page that was formerly to the right, let's make sure that the
-         * next pointer is zero.
+        /* Since this is the rightmost page at this level, and we may have
+         * already freed a page that was formerly to the right, let's make
+         * sure that the next pointer is zero.
          */
         if (p->header.next) {
                 if (log)
@@ -3539,6 +3533,12 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
                 p->header.next = 0;
         }
 
+        if (p->header.flag & BT_INTERNAL)
+                goto getChild;
+
+        /*
+         *      leaf page
+         */
         freed = 0;
 
         /* does region covered by leaf page precede Teof ? */
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 71bc34b96b2b..4226af3ea91b 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -442,6 +442,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
         inode->i_nlink = 1;
         inode->i_size = sb->s_bdev->bd_inode->i_size;
         inode->i_mapping->a_ops = &jfs_metapage_aops;
+        insert_inode_hash(inode);
         mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);
 
         sbi->direct_inode = inode;