Message ID | 20210326125321.28047-2-ailiop@suse.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | xfsdump: remove BMV_IF_NO_DMAPI_READ flag | expand |
On Fri, Mar 26, 2021 at 01:53:20PM +0100, Anthony Iliopoulos wrote: > Use of the flag has had no effect since kernel commit 288699fecaff > ("xfs: drop dmapi hooks") which removed all dmapi related code, so > we can remove it. > > Signed-off-by: Anthony Iliopoulos <ailiop@suse.com> > --- > dump/content.c | 1 - > dump/inomap.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/dump/content.c b/dump/content.c > index 75b79220daf6..a40b47101a12 100644 > --- a/dump/content.c > +++ b/dump/content.c > @@ -4287,7 +4287,6 @@ init_extent_group_context(jdm_fshandle_t *fshandlep, > gcp->eg_bmap[0].bmv_offset = 0; > gcp->eg_bmap[0].bmv_length = -1; > gcp->eg_bmap[0].bmv_count = BMAP_LEN; > - gcp->eg_bmap[0].bmv_iflags = BMV_IF_NO_DMAPI_READ; > gcp->eg_nextbmapp = &gcp->eg_bmap[1]; > gcp->eg_endbmapp = &gcp->eg_bmap[1]; > gcp->eg_bmapix = 0; > diff --git a/dump/inomap.c b/dump/inomap.c > index 85d61c353cf0..1333ca5bb8a8 100644 > --- a/dump/inomap.c > +++ b/dump/inomap.c > @@ -1647,7 +1647,6 @@ quantity2offset(jdm_fshandle_t *fshandlep, struct xfs_bstat *statp, off64_t qty) > bmap[0].bmv_offset = 0; > bmap[0].bmv_length = -1; > bmap[0].bmv_count = BMAP_LEN; > - bmap[0].bmv_iflags = BMV_IF_NO_DMAPI_READ; I don't think bmap[0] is guaranteed to be initialized at this point, so deleting this statement leaves bmv_iflags with random stack junk. --D > bmap[0].bmv_entries = -1; > fd = jdm_open(fshandlep, statp, O_RDONLY); > if (fd < 0) { > -- > 2.31.0 >
diff --git a/dump/content.c b/dump/content.c index 75b79220daf6..a40b47101a12 100644 --- a/dump/content.c +++ b/dump/content.c @@ -4287,7 +4287,6 @@ init_extent_group_context(jdm_fshandle_t *fshandlep, gcp->eg_bmap[0].bmv_offset = 0; gcp->eg_bmap[0].bmv_length = -1; gcp->eg_bmap[0].bmv_count = BMAP_LEN; - gcp->eg_bmap[0].bmv_iflags = BMV_IF_NO_DMAPI_READ; gcp->eg_nextbmapp = &gcp->eg_bmap[1]; gcp->eg_endbmapp = &gcp->eg_bmap[1]; gcp->eg_bmapix = 0; diff --git a/dump/inomap.c b/dump/inomap.c index 85d61c353cf0..1333ca5bb8a8 100644 --- a/dump/inomap.c +++ b/dump/inomap.c @@ -1647,7 +1647,6 @@ quantity2offset(jdm_fshandle_t *fshandlep, struct xfs_bstat *statp, off64_t qty) bmap[0].bmv_offset = 0; bmap[0].bmv_length = -1; bmap[0].bmv_count = BMAP_LEN; - bmap[0].bmv_iflags = BMV_IF_NO_DMAPI_READ; bmap[0].bmv_entries = -1; fd = jdm_open(fshandlep, statp, O_RDONLY); if (fd < 0) {
Use of the flag has had no effect since kernel commit 288699fecaff ("xfs: drop dmapi hooks") which removed all dmapi related code, so we can remove it. Signed-off-by: Anthony Iliopoulos <ailiop@suse.com> --- dump/content.c | 1 - dump/inomap.c | 1 - 2 files changed, 2 deletions(-)