| Message ID | 0df5fea5-2658-f2ac-a465-09d0ada4cccf@sandeen.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Nov 30, 2016 at 04:42:50PM -0600, Eric Sandeen wrote: > We've missed properly setting the buffer type for > an AGI transaction in 3 spots now, so just move it > into xfs_read_agi() and set it if we are in a transaction > to avoid the problem in the future. > > This is similar to how it is done in i.e. the dir3 > and attr3 read functions. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- Looks like there's one more instance that can be removed in xfs_iunlink(). Otherwise, looks good: Reviewed-by: Brian Foster <bfoster@redhat.com> > > diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c > index 51b4e0d..c482b97 100644 > --- a/fs/xfs/libxfs/xfs_ialloc.c > +++ b/fs/xfs/libxfs/xfs_ialloc.c > @@ -2450,8 +2450,6 @@ > ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC)); > #endif > > - xfs_trans_buf_set_type(tp, bp, XFS_BLFT_AGI_BUF); > - > /* > * Compute byte offsets for the first and last fields in the first > * region and log the agi buffer. This only logs up through > @@ -2592,6 +2590,8 @@ > XFS_FSS_TO_BB(mp, 1), 0, bpp, &xfs_agi_buf_ops); > if (error) > return error; > + if (tp) > + xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_AGI_BUF); > > xfs_buf_set_ref(*bpp, XFS_AGI_REF); > return 0; > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index 4e560e6..36e6372 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -2133,7 +2133,6 @@ > agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino); > offset = offsetof(xfs_agi_t, agi_unlinked) + > (sizeof(xfs_agino_t) * bucket_index); > - xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); > xfs_trans_log_buf(tp, agibp, offset, > (offset + sizeof(xfs_agino_t) - 1)); > } else { > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c > index 2d91f5a..9b3d7c7 100644 > --- a/fs/xfs/xfs_log_recover.c > +++ b/fs/xfs/xfs_log_recover.c > @@ -4929,7 +4929,6 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip) > agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO); > offset = offsetof(xfs_agi_t, agi_unlinked) + > (sizeof(xfs_agino_t) * bucket); > - xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); > xfs_trans_log_buf(tp, agibp, offset, > (offset + sizeof(xfs_agino_t) - 1)); > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 51b4e0d..c482b97 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2450,8 +2450,6 @@ ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC)); #endif - xfs_trans_buf_set_type(tp, bp, XFS_BLFT_AGI_BUF); - /* * Compute byte offsets for the first and last fields in the first * region and log the agi buffer. This only logs up through @@ -2592,6 +2590,8 @@ XFS_FSS_TO_BB(mp, 1), 0, bpp, &xfs_agi_buf_ops); if (error) return error; + if (tp) + xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_AGI_BUF); xfs_buf_set_ref(*bpp, XFS_AGI_REF); return 0; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 4e560e6..36e6372 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2133,7 +2133,6 @@ agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino); offset = offsetof(xfs_agi_t, agi_unlinked) + (sizeof(xfs_agino_t) * bucket_index); - xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); xfs_trans_log_buf(tp, agibp, offset, (offset + sizeof(xfs_agino_t) - 1)); } else { diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 2d91f5a..9b3d7c7 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -4929,7 +4929,6 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip) agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO); offset = offsetof(xfs_agi_t, agi_unlinked) + (sizeof(xfs_agino_t) * bucket); - xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF); xfs_trans_log_buf(tp, agibp, offset, (offset + sizeof(xfs_agino_t) - 1));
We've missed properly setting the buffer type for an AGI transaction in 3 spots now, so just move it into xfs_read_agi() and set it if we are in a transaction to avoid the problem in the future. This is similar to how it is done in i.e. the dir3 and attr3 read functions. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html