Commit 60bb8154 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-6.1-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Dave Chinner:
 "There are relatively few updates this cycle; half the cycle was eaten
  by a grue, the other half was eaten by a tricky data corruption issue
  that I still haven't entirely solved.

  Hence there's no major changes in this cycle and it's largely just
  minor cleanups and small bug fixes:

   - fixes for filesystem shutdown procedure during a DAX memory failure
     notification

   - bug fixes

   - logic cleanups

   - log message cleanups

   - updates to use vfs{g,u}id_t helpers where appropriate"

* tag 'xfs-6.1-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: on memory failure, only shut down fs after scanning all mappings
  xfs: rearrange the logic and remove the broken comment for xfs_dir2_isxx
  xfs: trim the mapp array accordingly in xfs_da_grow_inode_int
  xfs: do not need to check return value of xlog_kvmalloc()
  xfs: port to vfs{g,u}id_t and associated helpers
  xfs: remove xfs_setattr_time() declaration
  xfs: Remove the unneeded result variable
  xfs: missing space in xfs trace log
  xfs: simplify if-else condition in xfs_reflink_trim_around_shared
  xfs: simplify if-else condition in xfs_validate_new_dalign
  xfs: replace unnecessary seq_printf with seq_puts
  xfs: clean up "%Ld/%Lu" which doesn't meet C standard
  xfs: remove redundant else for clean code
  xfs: remove the redundant word in comment
parents 5d170fe4 e033f40b

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ xfs_check_block( 
			else

				thispa = XFS_BMBT_PTR_ADDR(mp, block, j, dmxr);

			if (*thispa == *pp) {

				xfs_warn(mp, "%s: thispa(%d) == pp(%d) %Ld",

				xfs_warn(mp, "%s: thispa(%d) == pp(%d) %lld",

					__func__, j, i,

					(unsigned long long)be64_to_cpu(*thispa));

				xfs_err(mp, "%s: ptrs are equal in node\n",

fs/xfs/libxfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -2192,8 +2192,8 @@ xfs_da_grow_inode_int( 
		 */

		mapp = kmem_alloc(sizeof(*mapp) * count, 0);

		for (b = *bno, mapi = 0; b < *bno + count; ) {

			nmap = min(XFS_BMAP_MAX_NMAP, count);

			c = (int)(*bno + count - b);

			nmap = min(XFS_BMAP_MAX_NMAP, c);

			error = xfs_bmapi_write(tp, dp, b, c,

					xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,

					args->total, &mapp[mapi], &nmap);

fs/xfs/libxfs/xfs_dir2.c

+30 −20
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ xfs_dir_createname( 
{

	struct xfs_da_args	*args;

	int			rval;

	int			v;		/* type-checking value */

	bool			v;



	ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@@ -357,7 +357,7 @@ xfs_dir_lookup( 
{

	struct xfs_da_args	*args;

	int			rval;

	int			v;	  /* type-checking value */

	bool			v;

	int			lock_mode;



	ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@@ -435,7 +435,7 @@ xfs_dir_removename( 
{

	struct xfs_da_args	*args;

	int			rval;

	int			v;		/* type-checking value */

	bool			v;



	ASSERT(S_ISDIR(VFS_I(dp)->i_mode));

	XFS_STATS_INC(dp->i_mount, xs_dir_remove);
@@ -493,7 +493,7 @@ xfs_dir_replace( 
{

	struct xfs_da_args	*args;

	int			rval;

	int			v;		/* type-checking value */

	bool			v;



	ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@@ -610,19 +610,23 @@ xfs_dir2_grow_inode( 
int

xfs_dir2_isblock(

	struct xfs_da_args	*args,

	int			*vp)	/* out: 1 is block, 0 is not block */

	bool			*isblock)

{

	xfs_fileoff_t		last;	/* last file offset */

	int			rval;

	struct xfs_mount	*mp = args->dp->i_mount;

	xfs_fileoff_t		eof;

	int			error;



	if ((rval = xfs_bmap_last_offset(args->dp, &last, XFS_DATA_FORK)))

		return rval;

	rval = XFS_FSB_TO_B(args->dp->i_mount, last) == args->geo->blksize;

	if (XFS_IS_CORRUPT(args->dp->i_mount,

			   rval != 0 &&

			   args->dp->i_disk_size != args->geo->blksize))

	error = xfs_bmap_last_offset(args->dp, &eof, XFS_DATA_FORK);

	if (error)

		return error;



	*isblock = false;

	if (XFS_FSB_TO_B(mp, eof) != args->geo->blksize)

		return 0;



	*isblock = true;

	if (XFS_IS_CORRUPT(mp, args->dp->i_disk_size != args->geo->blksize))

		return -EFSCORRUPTED;

	*vp = rval;

	return 0;

}
@@ -632,14 +636,20 @@ xfs_dir2_isblock( 
int

xfs_dir2_isleaf(

	struct xfs_da_args	*args,

	int			*vp)	/* out: 1 is block, 0 is not block */

	bool			*isleaf)

{

	xfs_fileoff_t		last;	/* last file offset */

	int			rval;

	xfs_fileoff_t		eof;

	int			error;



	if ((rval = xfs_bmap_last_offset(args->dp, &last, XFS_DATA_FORK)))

		return rval;

	*vp = last == args->geo->leafblk + args->geo->fsbcount;

	error = xfs_bmap_last_offset(args->dp, &eof, XFS_DATA_FORK);

	if (error)

		return error;



	*isleaf = false;

	if (eof != args->geo->leafblk + args->geo->fsbcount)

		return 0;



	*isleaf = true;

	return 0;

}

fs/xfs/libxfs/xfs_dir2.h

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args); 
/*

 * Interface routines used by userspace utilities

 */

extern int xfs_dir2_isblock(struct xfs_da_args *args, int *r);

extern int xfs_dir2_isleaf(struct xfs_da_args *args, int *r);

extern int xfs_dir2_isblock(struct xfs_da_args *args, bool *isblock);

extern int xfs_dir2_isleaf(struct xfs_da_args *args, bool *isleaf);

extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,

				struct xfs_buf *bp);

fs/xfs/libxfs/xfs_dir2_sf.c

+1 −3
Original line number Diff line number Diff line
@@ -865,7 +865,6 @@ xfs_dir2_sf_lookup( 
	struct xfs_inode	*dp = args->dp;

	struct xfs_mount	*mp = dp->i_mount;

	int			i;		/* entry index */

	int			error;

	xfs_dir2_sf_entry_t	*sfep;		/* shortform directory entry */

	xfs_dir2_sf_hdr_t	*sfp;		/* shortform structure */

	enum xfs_dacmp		cmp;		/* comparison result */
@@ -929,8 +928,7 @@ xfs_dir2_sf_lookup( 
	if (!ci_sfep)

		return -ENOENT;

	/* otherwise process the CI match as required by the caller */

	error = xfs_dir_cilookup_result(args, ci_sfep->name, ci_sfep->namelen);

	return error;

	return xfs_dir_cilookup_result(args, ci_sfep->name, ci_sfep->namelen);

}



/*