diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-08 12:11:45 -0600 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-08 12:11:45 -0600 | 
| commit | 1fe4fd6f5cad346e598593af36caeadc4f5d4fa9 (patch) | |
| tree | 9f43a0ab526558075199c649359a94748505c028 /fs/xfs/xfs_reflink.c | |
| parent | b7bfaa761d760e72a969d116517eaa12e404c262 (diff) | |
| parent | 601a27ea09a317d0fe2895df7d875381fb393041 (diff) | |
Merge tag 'xfs-6.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
 - Remove some incorrect assertions
 - Fix compiler warnings about variables that could be static
 - Fix an off by one error when computing the maximum btree height that
   can cause repair failures
 - Fix the bulkstat-single ioctl not returning the root inode when asked
   to do that
 - Convey NOFS state to inodegc workers to avoid recursion in reclaim
 - Fix unnecessary variable initializations
 - Fix a bug that could result in corruption of the busy extent tree
* tag 'xfs-6.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix extent busy updating
  xfs: xfs_qm: remove unnecessary ‘0’ values from error
  xfs: Fix deadlock on xfs_inodegc_worker
  xfs: get root inode correctly at bulkstat
  xfs: fix off-by-one error in xfs_btree_space_to_height
  xfs: make xfs_iomap_page_ops static
  xfs: don't assert if cmap covers imap after cycling lock
Diffstat (limited to 'fs/xfs/xfs_reflink.c')
| -rw-r--r-- | fs/xfs/xfs_reflink.c | 2 | 
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index fe46bce8cae6..5535778a98f9 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -416,8 +416,6 @@ xfs_reflink_fill_cow_hole(  		goto convert;  	} -	ASSERT(cmap->br_startoff > imap->br_startoff); -  	/* Allocate the entire reservation as unwritten blocks. */  	nimaps = 1;  	error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount,  | 
