Commit 36eb2194 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-fixes-6.13-rc7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Carlos Maiolino:

 - Fix a missing lock while detaching a dquot buffer

 - Fix failure on xfs_update_last_rtgroup_size for !XFS_RT

* tag 'xfs-fixes-6.13-rc7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: lock dquot buffer before detaching dquot from b_li_list
  xfs: don't return an error from xfs_update_last_rtgroup_size for !XFS_RT
parents 8c8d5411 111d36d6

fs/xfs/libxfs/xfs_rtgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static inline int xfs_initialize_rtgroups(struct xfs_mount *mp, 
}



# define xfs_rtgroup_extents(mp, rgno)		(0)

# define xfs_update_last_rtgroup_size(mp, rgno)	(-EOPNOTSUPP)

# define xfs_update_last_rtgroup_size(mp, rgno)	(0)

# define xfs_rtgroup_lock(rtg, gf)		((void)0)

# define xfs_rtgroup_unlock(rtg, gf)		((void)0)

# define xfs_rtgroup_trans_join(tp, rtg, gf)	((void)0)

fs/xfs/xfs_dquot.c

+2 −1
Original line number Diff line number Diff line
@@ -87,8 +87,9 @@ xfs_dquot_detach_buf( 
	}

	spin_unlock(&qlip->qli_lock);

	if (bp) {

		xfs_buf_lock(bp);

		list_del_init(&qlip->qli_item.li_bio_list);

		xfs_buf_rele(bp);

		xfs_buf_relse(bp);

	}

}