| Message ID | 8e4dd8ff-5202-0b9d-e3c6-193976d5b3cf@sandeen.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, May 04, 2018 at 12:34:22PM -0500, Eric Sandeen wrote: > During quotacheck we send in the quota type, so verify that as well. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_dquot_buf.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c > index a926058f7b0c..c00174f32f0d 100644 > --- a/fs/xfs/libxfs/xfs_dquot_buf.c > +++ b/fs/xfs/libxfs/xfs_dquot_buf.c > @@ -47,7 +47,7 @@ xfs_dquot_verify( > struct xfs_mount *mp, > xfs_disk_dquot_t *ddq, > xfs_dqid_t id, > - uint type) /* used only when IO_dorepair is true */ > + uint type) /* used only during quotacheck */ > { > /* > * We can encounter an uninitialized dquot buffer for 2 reasons: > @@ -69,6 +69,8 @@ xfs_dquot_verify( > if (ddq->d_version != XFS_DQUOT_VERSION) > return __this_address; > > + if (type && ddq->d_flags != type) > + return __this_address; > if (ddq->d_flags != XFS_DQ_USER && > ddq->d_flags != XFS_DQ_PROJ && > ddq->d_flags != XFS_DQ_GROUP) > -- > 2.17.0 > > -- > 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
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
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_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c index a926058f7b0c..c00174f32f0d 100644 --- a/fs/xfs/libxfs/xfs_dquot_buf.c +++ b/fs/xfs/libxfs/xfs_dquot_buf.c @@ -47,7 +47,7 @@ xfs_dquot_verify( struct xfs_mount *mp, xfs_disk_dquot_t *ddq, xfs_dqid_t id, - uint type) /* used only when IO_dorepair is true */ + uint type) /* used only during quotacheck */ { /* * We can encounter an uninitialized dquot buffer for 2 reasons: @@ -69,6 +69,8 @@ xfs_dquot_verify( if (ddq->d_version != XFS_DQUOT_VERSION) return __this_address; + if (type && ddq->d_flags != type) + return __this_address; if (ddq->d_flags != XFS_DQ_USER && ddq->d_flags != XFS_DQ_PROJ && ddq->d_flags != XFS_DQ_GROUP)
During quotacheck we send in the quota type, so verify that as well. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- fs/xfs/libxfs/xfs_dquot_buf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)