Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9db01927 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy 

Pull jfs update from Dave Kleikamp:
 "A couple cleanups to JFS for 3.11"

* tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy:
  jfs: Update jfs_error
  jfs: fix sparse warning in fs/jfs/xattr.c
parents 0ff08ba5 eb8630d7

fs/jfs/jfs_dmap.c

+27 −43
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks) 
		printk(KERN_ERR "blkno = %Lx, nblocks = %Lx\n",

		       (unsigned long long) blkno,

		       (unsigned long long) nblocks);

		jfs_error(ip->i_sb,

			  "dbFree: block to be freed is outside the map");

		jfs_error(ip->i_sb, "block to be freed is outside the map\n");

		return -EIO;

	}
@@ -384,7 +383,7 @@ int dbFree(struct inode *ip, s64 blkno, s64 nblocks) 


		/* free the blocks. */

		if ((rc = dbFreeDmap(bmp, dp, blkno, nb))) {

			jfs_error(ip->i_sb, "dbFree: error in block map\n");

			jfs_error(ip->i_sb, "error in block map\n");

			release_metapage(mp);

			IREAD_UNLOCK(ipbmap);

			return (rc);
@@ -441,8 +440,7 @@ dbUpdatePMap(struct inode *ipbmap, 
		printk(KERN_ERR "blkno = %Lx, nblocks = %Lx\n",

		       (unsigned long long) blkno,

		       (unsigned long long) nblocks);

		jfs_error(ipbmap->i_sb,

			  "dbUpdatePMap: blocks are outside the map");

		jfs_error(ipbmap->i_sb, "blocks are outside the map\n");

		return -EIO;

	}
@@ -726,7 +724,7 @@ int dbAlloc(struct inode *ip, s64 hint, s64 nblocks, s64 * results) 


	/* the hint should be within the map */

	if (hint >= mapSize) {

		jfs_error(ip->i_sb, "dbAlloc: the hint is outside the map");

		jfs_error(ip->i_sb, "the hint is outside the map\n");

		return -EIO;

	}
@@ -1057,8 +1055,7 @@ static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks) 
	bmp = sbi->bmap;

	if (lastblkno < 0 || lastblkno >= bmp->db_mapsize) {

		IREAD_UNLOCK(ipbmap);

		jfs_error(ip->i_sb,

			  "dbExtend: the block is outside the filesystem");

		jfs_error(ip->i_sb, "the block is outside the filesystem\n");

		return -EIO;

	}
@@ -1134,8 +1131,7 @@ static int dbAllocNext(struct bmap * bmp, struct dmap * dp, s64 blkno, 
	u32 mask;



	if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAllocNext: Corrupt dmap page");

		jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmap page\n");

		return -EIO;

	}
@@ -1265,8 +1261,7 @@ dbAllocNear(struct bmap * bmp, 
	s8 *leaf;



	if (dp->tree.leafidx != cpu_to_le32(LEAFIND)) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAllocNear: Corrupt dmap page");

		jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmap page\n");

		return -EIO;

	}
@@ -1381,8 +1376,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
	 */

	if (l2nb > bmp->db_agl2size) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAllocAG: allocation request is larger than the "

			  "allocation group size");

			  "allocation request is larger than the allocation group size\n");

		return -EIO;

	}
@@ -1417,7 +1411,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
			       (unsigned long long) blkno,

			       (unsigned long long) nblocks);

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbAllocAG: dbAllocCtl failed in free AG");

				  "dbAllocCtl failed in free AG\n");

		}

		return (rc);

	}
@@ -1433,8 +1427,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
	budmin = dcp->budmin;



	if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAllocAG: Corrupt dmapctl page");

		jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n");

		release_metapage(mp);

		return -EIO;

	}
@@ -1475,7 +1468,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
			}

			if (n == 4) {

				jfs_error(bmp->db_ipbmap->i_sb,

					  "dbAllocAG: failed descending stree");

					  "failed descending stree\n");

				release_metapage(mp);

				return -EIO;

			}
@@ -1515,8 +1508,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
				       &blkno))) {

				if (rc == -ENOSPC) {

					jfs_error(bmp->db_ipbmap->i_sb,

						  "dbAllocAG: control page "

						  "inconsistent");

						  "control page inconsistent\n");

					return -EIO;

				}

				return (rc);
@@ -1528,7 +1520,7 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) 
		rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results);

		if (rc == -ENOSPC) {

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbAllocAG: unable to allocate blocks");

				  "unable to allocate blocks\n");

			rc = -EIO;

		}

		return (rc);
@@ -1587,8 +1579,7 @@ static int dbAllocAny(struct bmap * bmp, s64 nblocks, int l2nb, s64 * results) 
	 */

	rc = dbAllocCtl(bmp, nblocks, l2nb, blkno, results);

	if (rc == -ENOSPC) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAllocAny: unable to allocate blocks");

		jfs_error(bmp->db_ipbmap->i_sb, "unable to allocate blocks\n");

		return -EIO;

	}

	return (rc);
@@ -1652,8 +1643,7 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) 
	range_cnt = min_t(u64, max_ranges + 1, 32 * 1024);

	totrim = kmalloc(sizeof(struct range2trim) * range_cnt, GFP_NOFS);

	if (totrim == NULL) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbDiscardAG: no memory for trim array");

		jfs_error(bmp->db_ipbmap->i_sb, "no memory for trim array\n");

		IWRITE_UNLOCK(ipbmap);

		return 0;

	}
@@ -1682,8 +1672,7 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) 
			nblocks = 1 << l2nb;

		} else {

			/* Trim any already allocated blocks */

			jfs_error(bmp->db_ipbmap->i_sb,

				"dbDiscardAG: -EIO");

			jfs_error(bmp->db_ipbmap->i_sb, "-EIO\n");

			break;

		}
@@ -1761,7 +1750,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno) 


		if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbFindCtl: Corrupt dmapctl page");

				  "Corrupt dmapctl page\n");

			release_metapage(mp);

			return -EIO;

		}
@@ -1782,7 +1771,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno) 
		if (rc) {

			if (lev != level) {

				jfs_error(bmp->db_ipbmap->i_sb,

					  "dbFindCtl: dmap inconsistent");

					  "dmap inconsistent\n");

				return -EIO;

			}

			return -ENOSPC;
@@ -1906,7 +1895,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results) 
		if (dp->tree.stree[ROOT] != L2BPERDMAP) {

			release_metapage(mp);

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbAllocCtl: the dmap is not all free");

				  "the dmap is not all free\n");

			rc = -EIO;

			goto backout;

		}
@@ -1953,7 +1942,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results) 
			 * to indicate that we have leaked blocks.

			 */

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbAllocCtl: I/O Error: Block Leakage.");

				  "I/O Error: Block Leakage\n");

			continue;

		}

		dp = (struct dmap *) mp->data;
@@ -1965,8 +1954,7 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results) 
			 * to indicate that we have leaked blocks.

			 */

			release_metapage(mp);

			jfs_error(bmp->db_ipbmap->i_sb,

				  "dbAllocCtl: Block Leakage.");

			jfs_error(bmp->db_ipbmap->i_sb, "Block Leakage\n");

			continue;

		}
@@ -2263,8 +2251,7 @@ static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno, 
			for (; nwords > 0; nwords -= nw) {

				if (leaf[word] < BUDMIN) {

					jfs_error(bmp->db_ipbmap->i_sb,

						  "dbAllocBits: leaf page "

						  "corrupt");

						  "leaf page corrupt\n");

					break;

				}
@@ -2536,8 +2523,7 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level) 
	dcp = (struct dmapctl *) mp->data;



	if (dcp->leafidx != cpu_to_le32(CTLLEAFIND)) {

		jfs_error(bmp->db_ipbmap->i_sb,

			  "dbAdjCtl: Corrupt dmapctl page");

		jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n");

		release_metapage(mp);

		return -EIO;

	}
@@ -2638,8 +2624,7 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level) 
			assert(level == bmp->db_maxlevel);

			if (bmp->db_maxfreebud != oldroot) {

				jfs_error(bmp->db_ipbmap->i_sb,

					  "dbAdjCtl: the maximum free buddy is "

					  "not the old root");

					  "the maximum free buddy is not the old root\n");

			}

			bmp->db_maxfreebud = dcp->stree[ROOT];

		}
@@ -3481,7 +3466,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) 
	p = BMAPBLKNO + nbperpage;	/* L2 page */

	l2mp = read_metapage(ipbmap, p, PSIZE, 0);

	if (!l2mp) {

		jfs_error(ipbmap->i_sb, "dbExtendFS: L2 page could not be read");

		jfs_error(ipbmap->i_sb, "L2 page could not be read\n");

		return -EIO;

	}

	l2dcp = (struct dmapctl *) l2mp->data;
@@ -3646,8 +3631,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) 
		}

	}			/* for each L1 in a L2 */



	jfs_error(ipbmap->i_sb,

		  "dbExtendFS: function has not returned as expected");

	jfs_error(ipbmap->i_sb, "function has not returned as expected\n");

errout:

	if (l0mp)

		release_metapage(l0mp);
@@ -3717,7 +3701,7 @@ void dbFinalizeBmap(struct inode *ipbmap) 
		}

		if (bmp->db_agpref >= bmp->db_numag) {

			jfs_error(ipbmap->i_sb,

				  "cannot find ag with average freespace");

				  "cannot find ag with average freespace\n");

		}

	}

fs/jfs/jfs_dtree.c

+18 −19
Original line number Diff line number Diff line
@@ -125,20 +125,20 @@ struct dtsplit { 


/* get page buffer for specified block address */

#define DT_GETPAGE(IP, BN, MP, SIZE, P, RC)				\

{\

	BT_GETPAGE(IP, BN, MP, dtpage_t, SIZE, P, RC, i_dtroot)\

	if (!(RC))\

	{\

		if (((P)->header.nextindex > (((BN)==0)?DTROOTMAXSLOT:(P)->header.maxslot)) ||\

		    ((BN) && ((P)->header.maxslot > DTPAGEMAXSLOT)))\

		{\

do {									\

	BT_GETPAGE(IP, BN, MP, dtpage_t, SIZE, P, RC, i_dtroot);	\

	if (!(RC)) {							\

		if (((P)->header.nextindex >				\

		     (((BN) == 0) ? DTROOTMAXSLOT : (P)->header.maxslot)) || \

		    ((BN) && ((P)->header.maxslot > DTPAGEMAXSLOT))) {	\

			BT_PUTPAGE(MP);					\

			jfs_error((IP)->i_sb, "DT_GETPAGE: dtree page corrupt");\

			jfs_error((IP)->i_sb,				\

				  "DT_GETPAGE: dtree page corrupt\n");	\

			MP = NULL;					\

			RC = -EIO;					\

		}							\

	}								\

}

} while (0)



/* for consistency */

#define DT_PUTPAGE(MP) BT_PUTPAGE(MP)
@@ -776,7 +776,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data, 
			/* Something's corrupted, mark filesystem dirty so

			 * chkdsk will fix it.

			 */

			jfs_error(sb, "stack overrun in dtSearch!");

			jfs_error(sb, "stack overrun!\n");

			BT_STACK_DUMP(btstack);

			rc = -EIO;

			goto out;
@@ -3247,8 +3247,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) 
				/* Sanity Check */

				if (d_namleft == 0) {

					jfs_error(ip->i_sb,

						  "JFS:Dtree error: ino = "

						  "%ld, bn=%Ld, index = %d",

						  "JFS:Dtree error: ino = %ld, bn=%lld, index = %d\n",

						  (long)ip->i_ino,

						  (long long)bn,

						  i);
@@ -3368,7 +3367,7 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack) 
		 */

		if (BT_STACK_FULL(btstack)) {

			DT_PUTPAGE(mp);

			jfs_error(ip->i_sb, "dtReadFirst: btstack overrun");

			jfs_error(ip->i_sb, "btstack overrun\n");

			BT_STACK_DUMP(btstack);

			return -EIO;

		}

fs/jfs/jfs_extent.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp) 


	if ((rc == 0) && xlen) {

		if (xlen != nbperpage) {

			jfs_error(ip->i_sb, "extHint: corrupt xtree");

			jfs_error(ip->i_sb, "corrupt xtree\n");

			rc = -EIO;

		}

		XADaddress(xp, xaddr);

fs/jfs/jfs_imap.c

+29 −40
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ int diRead(struct inode *ip) 
	dp += rel_inode;



	if (ip->i_ino != le32_to_cpu(dp->di_number)) {

		jfs_error(ip->i_sb, "diRead: i_ino != di_number");

		jfs_error(ip->i_sb, "i_ino != di_number\n");

		rc = -EIO;

	} else if (le32_to_cpu(dp->di_nlink) == 0)

		rc = -ESTALE;
@@ -625,7 +625,7 @@ int diWrite(tid_t tid, struct inode *ip) 
	if (!addressPXD(&(jfs_ip->ixpxd)) ||

	    (lengthPXD(&(jfs_ip->ixpxd)) !=

	     JFS_IP(ipimap)->i_imap->im_nbperiext)) {

		jfs_error(ip->i_sb, "diWrite: ixpxd invalid");

		jfs_error(ip->i_sb, "ixpxd invalid\n");

		return -EIO;

	}
@@ -893,8 +893,7 @@ int diFree(struct inode *ip) 
	if (iagno >= imap->im_nextiag) {

		print_hex_dump(KERN_ERR, "imap: ", DUMP_PREFIX_ADDRESS, 16, 4,

			       imap, 32, 0);

		jfs_error(ip->i_sb,

			  "diFree: inum = %d, iagno = %d, nextiag = %d",

		jfs_error(ip->i_sb, "inum = %d, iagno = %d, nextiag = %d\n",

			  (uint) inum, iagno, imap->im_nextiag);

		return -EIO;

	}
@@ -930,15 +929,14 @@ int diFree(struct inode *ip) 
	mask = HIGHORDER >> bitno;



	if (!(le32_to_cpu(iagp->wmap[extno]) & mask)) {

		jfs_error(ip->i_sb,

			  "diFree: wmap shows inode already free");

		jfs_error(ip->i_sb, "wmap shows inode already free\n");

	}



	if (!addressPXD(&iagp->inoext[extno])) {

		release_metapage(mp);

		IREAD_UNLOCK(ipimap);

		AG_UNLOCK(imap, agno);

		jfs_error(ip->i_sb, "diFree: invalid inoext");

		jfs_error(ip->i_sb, "invalid inoext\n");

		return -EIO;

	}
@@ -950,7 +948,7 @@ int diFree(struct inode *ip) 
		release_metapage(mp);

		IREAD_UNLOCK(ipimap);

		AG_UNLOCK(imap, agno);

		jfs_error(ip->i_sb, "diFree: numfree > numinos");

		jfs_error(ip->i_sb, "numfree > numinos\n");

		return -EIO;

	}

	/*
@@ -1199,7 +1197,7 @@ int diFree(struct inode *ip) 
	 * for the inode being freed.

	 */

	if (iagp->pmap[extno] != 0) {

		jfs_error(ip->i_sb, "diFree: the pmap does not show inode free");

		jfs_error(ip->i_sb, "the pmap does not show inode free\n");

	}

	iagp->wmap[extno] = 0;

	PXDlength(&iagp->inoext[extno], 0);
@@ -1518,8 +1516,7 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) 
					release_metapage(mp);

					AG_UNLOCK(imap, agno);

					jfs_error(ip->i_sb,

						  "diAlloc: can't find free bit "

						  "in wmap");

						  "can't find free bit in wmap\n");

					return -EIO;

				}
@@ -1660,7 +1657,7 @@ diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip) 
	numinos = imap->im_agctl[agno].numinos;



	if (numfree > numinos) {

		jfs_error(ip->i_sb, "diAllocAG: numfree > numinos");

		jfs_error(ip->i_sb, "numfree > numinos\n");

		return -EIO;

	}
@@ -1811,8 +1808,7 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) 
	if (!iagp->nfreeinos) {

		IREAD_UNLOCK(imap->im_ipimap);

		release_metapage(mp);

		jfs_error(ip->i_sb,

			  "diAllocIno: nfreeinos = 0, but iag on freelist");

		jfs_error(ip->i_sb, "nfreeinos = 0, but iag on freelist\n");

		return -EIO;

	}
@@ -1824,7 +1820,7 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) 
			IREAD_UNLOCK(imap->im_ipimap);

			release_metapage(mp);

			jfs_error(ip->i_sb,

				  "diAllocIno: free inode not found in summary map");

				  "free inode not found in summary map\n");

			return -EIO;

		}
@@ -1839,7 +1835,7 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) 
	if (rem >= EXTSPERSUM) {

		IREAD_UNLOCK(imap->im_ipimap);

		release_metapage(mp);

		jfs_error(ip->i_sb, "diAllocIno: no free extent found");

		jfs_error(ip->i_sb, "no free extent found\n");

		return -EIO;

	}

	extno = (sword << L2EXTSPERSUM) + rem;
@@ -1850,7 +1846,7 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) 
	if (rem >= INOSPEREXT) {

		IREAD_UNLOCK(imap->im_ipimap);

		release_metapage(mp);

		jfs_error(ip->i_sb, "diAllocIno: free inode not found");

		jfs_error(ip->i_sb, "free inode not found\n");

		return -EIO;

	}
@@ -1936,7 +1932,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) 
		IREAD_LOCK(imap->im_ipimap, RDWRLOCK_IMAP);

		if ((rc = diIAGRead(imap, iagno, &mp))) {

			IREAD_UNLOCK(imap->im_ipimap);

			jfs_error(ip->i_sb, "diAllocExt: error reading iag");

			jfs_error(ip->i_sb, "error reading iag\n");

			return rc;

		}

		iagp = (struct iag *) mp->data;
@@ -1948,8 +1944,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) 
		if (sword >= SMAPSZ) {

			release_metapage(mp);

			IREAD_UNLOCK(imap->im_ipimap);

			jfs_error(ip->i_sb,

				  "diAllocExt: free ext summary map not found");

			jfs_error(ip->i_sb, "free ext summary map not found\n");

			return -EIO;

		}

		if (~iagp->extsmap[sword])
@@ -1962,7 +1957,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) 
	if (rem >= EXTSPERSUM) {

		release_metapage(mp);

		IREAD_UNLOCK(imap->im_ipimap);

		jfs_error(ip->i_sb, "diAllocExt: free extent not found");

		jfs_error(ip->i_sb, "free extent not found\n");

		return -EIO;

	}

	extno = (sword << L2EXTSPERSUM) + rem;
@@ -2081,8 +2076,7 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) 
		if (bmp)

			release_metapage(bmp);



		jfs_error(imap->im_ipimap->i_sb,

			  "diAllocBit: iag inconsistent");

		jfs_error(imap->im_ipimap->i_sb, "iag inconsistent\n");

		return -EIO;

	}
@@ -2189,7 +2183,7 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) 
	/* better have free extents.

	 */

	if (!iagp->nfreeexts) {

		jfs_error(imap->im_ipimap->i_sb, "diNewExt: no free extents");

		jfs_error(imap->im_ipimap->i_sb, "no free extents\n");

		return -EIO;

	}
@@ -2261,7 +2255,7 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) 
			}

			if (ciagp == NULL) {

				jfs_error(imap->im_ipimap->i_sb,

					  "diNewExt: ciagp == NULL");

					  "ciagp == NULL\n");

				rc = -EIO;

				goto error_out;

			}
@@ -2498,7 +2492,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp) 
			IWRITE_UNLOCK(ipimap);

			IAGFREE_UNLOCK(imap);

			jfs_error(imap->im_ipimap->i_sb,

				  "diNewIAG: ipimap->i_size is wrong");

				  "ipimap->i_size is wrong\n");

			return -EIO;

		}
@@ -2758,8 +2752,7 @@ diUpdatePMap(struct inode *ipimap, 
	iagno = INOTOIAG(inum);

	/* make sure that the iag is contained within the map */

	if (iagno >= imap->im_nextiag) {

		jfs_error(ipimap->i_sb,

			  "diUpdatePMap: the iag is outside the map");

		jfs_error(ipimap->i_sb, "the iag is outside the map\n");

		return -EIO;

	}

	/* read the iag */
@@ -2788,13 +2781,13 @@ diUpdatePMap(struct inode *ipimap, 
		 */

		if (!(le32_to_cpu(iagp->wmap[extno]) & mask)) {

			jfs_error(ipimap->i_sb,

				  "diUpdatePMap: inode %ld not marked as "

				  "allocated in wmap!", inum);

				  "inode %ld not marked as allocated in wmap!\n",

				  inum);

		}

		if (!(le32_to_cpu(iagp->pmap[extno]) & mask)) {

			jfs_error(ipimap->i_sb,

				  "diUpdatePMap: inode %ld not marked as "

				  "allocated in pmap!", inum);

				  "inode %ld not marked as allocated in pmap!\n",

				  inum);

		}

		/* update the bitmap for the extent of the freed inode */

		iagp->pmap[extno] &= cpu_to_le32(~mask);
@@ -2809,15 +2802,13 @@ diUpdatePMap(struct inode *ipimap, 
		if (!(le32_to_cpu(iagp->wmap[extno]) & mask)) {

			release_metapage(mp);

			jfs_error(ipimap->i_sb,

				  "diUpdatePMap: the inode is not allocated in "

				  "the working map");

				  "the inode is not allocated in the working map\n");

			return -EIO;

		}

		if ((le32_to_cpu(iagp->pmap[extno]) & mask) != 0) {

			release_metapage(mp);

			jfs_error(ipimap->i_sb,

				  "diUpdatePMap: the inode is not free in the "

				  "persistent map");

				  "the inode is not free in the persistent map\n");

			return -EIO;

		}

		/* update the bitmap for the extent of the allocated inode */
@@ -2909,8 +2900,7 @@ int diExtendFS(struct inode *ipimap, struct inode *ipbmap) 
		iagp = (struct iag *) bp->data;

		if (le32_to_cpu(iagp->iagnum) != i) {

			release_metapage(bp);

			jfs_error(ipimap->i_sb,

				  "diExtendFs: unexpected value of iagnum");

			jfs_error(ipimap->i_sb, "unexpected value of iagnum\n");

			return -EIO;

		}
@@ -2986,8 +2976,7 @@ int diExtendFS(struct inode *ipimap, struct inode *ipbmap) 


	if (xnuminos != atomic_read(&imap->im_numinos) ||

	    xnumfree != atomic_read(&imap->im_numfree)) {

		jfs_error(ipimap->i_sb,

			  "diExtendFs: numinos or numfree incorrect");

		jfs_error(ipimap->i_sb, "numinos or numfree incorrect\n");

		return -EIO;

	}

fs/jfs/jfs_metapage.c

+2 −3
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, 
	if (mp) {

		if (mp->logical_size != size) {

			jfs_error(inode->i_sb,

				  "__get_metapage: mp->logical_size != size");

				  "get_mp->logical_size != size\n");

			jfs_err("logical_size = %d, size = %d",

				mp->logical_size, size);

			dump_stack();
@@ -658,8 +658,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, 
		if (test_bit(META_discard, &mp->flag)) {

			if (!new) {

				jfs_error(inode->i_sb,

					  "__get_metapage: using a "

					  "discarded metapage");

					  "using a discarded metapage\n");

				discard_metapage(mp);

				goto unlock;

			}