Skip to content

Commit 36eb219

Browse files
committed
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
2 parents 8c8d541 + 111d36d commit 36eb219

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

fs/xfs/libxfs/xfs_rtgroup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static inline int xfs_initialize_rtgroups(struct xfs_mount *mp,
272272
}
273273

274274
# define xfs_rtgroup_extents(mp, rgno) (0)
275-
# define xfs_update_last_rtgroup_size(mp, rgno) (-EOPNOTSUPP)
275+
# define xfs_update_last_rtgroup_size(mp, rgno) (0)
276276
# define xfs_rtgroup_lock(rtg, gf) ((void)0)
277277
# define xfs_rtgroup_unlock(rtg, gf) ((void)0)
278278
# define xfs_rtgroup_trans_join(tp, rtg, gf) ((void)0)

fs/xfs/xfs_dquot.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ xfs_dquot_detach_buf(
8787
}
8888
spin_unlock(&qlip->qli_lock);
8989
if (bp) {
90+
xfs_buf_lock(bp);
9091
list_del_init(&qlip->qli_item.li_bio_list);
91-
xfs_buf_rele(bp);
92+
xfs_buf_relse(bp);
9293
}
9394
}
9495

0 commit comments

Comments
 (0)