Commit 4adeaaf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: replace __inline with inline
  jfs: le*_add_cpu conversion
parents 9732b611 15732a1c

fs/jfs/jfs_dmap.c

+5 −6
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ static void dbAllocBits(struct bmap * bmp, struct dmap * dp, s64 blkno, 
	}



	/* update the free count for this dmap */

	dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) - nblocks);

	le32_add_cpu(&dp->nfree, -nblocks);



	BMAP_LOCK(bmp);
@@ -2316,7 +2316,7 @@ static int dbFreeBits(struct bmap * bmp, struct dmap * dp, s64 blkno, 


	/* update the free count for this dmap.

	 */

	dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) + nblocks);

	le32_add_cpu(&dp->nfree, nblocks);



	BMAP_LOCK(bmp);
@@ -3226,7 +3226,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno, 
	}



	/* update the free count for this dmap */

	dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) - nblocks);

	le32_add_cpu(&dp->nfree, -nblocks);



	/* reconstruct summary tree */

	dbInitDmapTree(dp);
@@ -3660,9 +3660,8 @@ static int dbInitDmap(struct dmap * dp, s64 Blkno, int nblocks) 
			goto initTree;

		}

	} else {

		dp->nblocks =

		    cpu_to_le32(le32_to_cpu(dp->nblocks) + nblocks);

		dp->nfree = cpu_to_le32(le32_to_cpu(dp->nfree) + nblocks);

		le32_add_cpu(&dp->nblocks, nblocks);

		le32_add_cpu(&dp->nfree, nblocks);

	}



	/* word number containing start block number */

fs/jfs/jfs_dmap.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
 * determine the maximum free string for four (lower level) nodes

 * of the tree.

 */

static __inline signed char TREEMAX(signed char *cp)

static inline signed char TREEMAX(signed char *cp)

{

	signed char tmp1, tmp2;

fs/jfs/jfs_imap.c

+6 −9
Original line number Diff line number Diff line
@@ -1019,8 +1019,7 @@ int diFree(struct inode *ip) 
		/* update the free inode counts at the iag, ag and

		 * map level.

		 */

		iagp->nfreeinos =

		    cpu_to_le32(le32_to_cpu(iagp->nfreeinos) + 1);

		le32_add_cpu(&iagp->nfreeinos, 1);

		imap->im_agctl[agno].numfree += 1;

		atomic_inc(&imap->im_numfree);
@@ -1219,9 +1218,8 @@ int diFree(struct inode *ip) 
	/* update the number of free inodes and number of free extents

	 * for the iag.

	 */

	iagp->nfreeinos = cpu_to_le32(le32_to_cpu(iagp->nfreeinos) -

				      (INOSPEREXT - 1));

	iagp->nfreeexts = cpu_to_le32(le32_to_cpu(iagp->nfreeexts) + 1);

	le32_add_cpu(&iagp->nfreeinos, -(INOSPEREXT - 1));

	le32_add_cpu(&iagp->nfreeexts, 1);



	/* update the number of free inodes and backed inodes

	 * at the ag and inode map level.
@@ -2124,7 +2122,7 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) 
	/* update the free inode count at the iag, ag, inode

	 * map levels.

	 */

	iagp->nfreeinos = cpu_to_le32(le32_to_cpu(iagp->nfreeinos) - 1);

	le32_add_cpu(&iagp->nfreeinos, -1);

	imap->im_agctl[agno].numfree -= 1;

	atomic_dec(&imap->im_numfree);
@@ -2378,9 +2376,8 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) 
	/* update the free inode and free extent counts for the

	 * iag.

	 */

	iagp->nfreeinos = cpu_to_le32(le32_to_cpu(iagp->nfreeinos) +

				      (INOSPEREXT - 1));

	iagp->nfreeexts = cpu_to_le32(le32_to_cpu(iagp->nfreeexts) - 1);

	le32_add_cpu(&iagp->nfreeinos, (INOSPEREXT - 1));

	le32_add_cpu(&iagp->nfreeexts, -1);



	/* update the free and backed inode counts for the ag.

	 */

fs/jfs/jfs_xtree.c

+8 −18
Original line number Diff line number Diff line
@@ -905,8 +905,7 @@ int xtInsert(tid_t tid, /* transaction id */ 
	XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr);



	/* advance next available entry index */

	p->header.nextindex =

	    cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1);

	le16_add_cpu(&p->header.nextindex, 1);



	/* Don't log it if there are no links to the file */

	if (!test_cflag(COMMIT_Nolink, ip)) {
@@ -997,8 +996,7 @@ xtSplitUp(tid_t tid, 
			    split->addr);



		/* advance next available entry index */

		sp->header.nextindex =

		    cpu_to_le16(le16_to_cpu(sp->header.nextindex) + 1);

		le16_add_cpu(&sp->header.nextindex, 1);



		/* Don't log it if there are no links to the file */

		if (!test_cflag(COMMIT_Nolink, ip)) {
@@ -1167,9 +1165,7 @@ xtSplitUp(tid_t tid, 
				    JFS_SBI(ip->i_sb)->nbperpage, rcbn);



			/* advance next available entry index. */

			sp->header.nextindex =

			    cpu_to_le16(le16_to_cpu(sp->header.nextindex) +

					1);

			le16_add_cpu(&sp->header.nextindex, 1);



			/* Don't log it if there are no links to the file */

			if (!test_cflag(COMMIT_Nolink, ip)) {
@@ -1738,8 +1734,7 @@ int xtExtend(tid_t tid, /* transaction id */ 
		XT_PUTENTRY(xad, XAD_NEW, xoff, len, xaddr);



		/* advance next available entry index */

		p->header.nextindex =

		    cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1);

		le16_add_cpu(&p->header.nextindex, 1);

	}



	/* get back old entry */
@@ -1905,8 +1900,7 @@ printf("xtTailgate: xoff:0x%lx xlen:0x%x xaddr:0x%lx\n", 
		XT_PUTENTRY(xad, XAD_NEW, xoff, xlen, xaddr);



		/* advance next available entry index */

		p->header.nextindex =

		    cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1);

		le16_add_cpu(&p->header.nextindex, 1);

	}



	/* get back old XAD */
@@ -2567,8 +2561,7 @@ int xtAppend(tid_t tid, /* transaction id */ 
	XT_PUTENTRY(xad, xflag, xoff, xlen, xaddr);



	/* advance next available entry index */

	p->header.nextindex =

	    cpu_to_le16(le16_to_cpu(p->header.nextindex) + 1);

	le16_add_cpu(&p->header.nextindex, 1);



	xtlck->lwm.offset =

	    (xtlck->lwm.offset) ? min(index,(int) xtlck->lwm.offset) : index;
@@ -2631,8 +2624,7 @@ int xtDelete(tid_t tid, struct inode *ip, s64 xoff, s32 xlen, int flag) 
	 * delete the entry from the leaf page

	 */

	nextindex = le16_to_cpu(p->header.nextindex);

	p->header.nextindex =

	    cpu_to_le16(le16_to_cpu(p->header.nextindex) - 1);

	le16_add_cpu(&p->header.nextindex, -1);



	/*

	 * if the leaf page bocome empty, free the page
@@ -2795,9 +2787,7 @@ xtDeleteUp(tid_t tid, struct inode *ip, 
					(nextindex - index -

					 1) << L2XTSLOTSIZE);



			p->header.nextindex =

			    cpu_to_le16(le16_to_cpu(p->header.nextindex) -

					1);

			le16_add_cpu(&p->header.nextindex, -1);

			jfs_info("xtDeleteUp(entry): 0x%lx[%d]",

				 (ulong) parent->bn, index);

		}