Merge tag 'jfs-5.11' of git://github.com/kleikamp/linux-shaggy (9867cb1f) · Commits · 戴 / test

fs/jfs/jfs_dmap.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ unlock:
		* this does not succeed, we finally try to allocate anywhere
		* within the aggregate.
		*
		* we also try to allocate anywhere within the aggregate for
		* we also try to allocate anywhere within the aggregate
		* for allocation requests larger than the allocation group
		* size or requests that specify no hint value.
		*
		@@ -2549,16 +2549,20 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level)
		*/
		if (oldval == NOFREE) {
		rc = dbBackSplit((dmtree_t *) dcp, leafno);
		if (rc)
		if (rc) {
		release_metapage(mp);
		return rc;
		}
		oldval = dcp->stree[ti];
		}
		dbSplit((dmtree_t *) dcp, leafno, dcp->budmin, newval);
		} else {
		rc = dbJoin((dmtree_t *) dcp, leafno, newval);
		if (rc)
		if (rc) {
		release_metapage(mp);
		return rc;
		}
		}

		/* check if the root of the current dmap control page changed due
		* to the update and if the current dmap control page is not at

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ typedef union dmtree {
		#define dmt_leafidx t1.leafidx
		#define dmt_height t1.height
		#define dmt_budmin t1.budmin
		#define dmt_stree t1.stree
		#define dmt_stree t2.stree

		/*
		* on-disk aggregate disk allocation map descriptor.

+1 −1

Original line number	Diff line number	Diff line
		@@ -575,7 +575,7 @@ extBalloc(struct inode ip, s64 hint, s64 nblocks, s64 * blkno)
		* blkno - starting block number of the extents current allocation.
		* nblks - number of blocks within the extents current allocation.
		* newnblks - pointer to a s64 value. on entry, this value is the
		* the new desired extent size (number of blocks). on
		* new desired extent size (number of blocks). on
		* successful exit, this value is set to the extent's actual
		* new size (new number of blocks).
		* newblkno - the starting block number of the extents new allocation.

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		#ifndef _H_JFS_EXTENT
		#define _H_JFS_EXTENT

		/* get block allocation allocation hint as location of disk inode */
		/* get block allocation hint as location of disk inode */
		#define INOHINT(ip) \
		(addressPXD(&(JFS_IP(ip)->ixpxd)) + lengthPXD(&(JFS_IP(ip)->ixpxd)) - 1)

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ struct logpage {
		* (this comment should be rewritten !)
		* jfs uses only "after" log records (only a single writer is allowed
		* in a page, pages are written to temporary paging space if
		* if they must be written to disk before commit, and i/o is
		* they must be written to disk before commit, and i/o is
		* scheduled for modified pages to their home location after
		* the log records containing the after values and the commit
		* record is written to the log on disk, undo discards the copy