diff mbox series

[11/12] libxfs-diff: try harder to find the kernel equivalent libxfs files

Message ID 156104944022.1172531.15814499652713220817.stgit@magnolia (mailing list archive)
State Superseded
Headers show
Series xfsprogs-5.1: fix various problems | expand

Commit Message

Darrick J. Wong June 20, 2019, 4:50 p.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

Now that we're syncing userspace libxfs/ files with kernel fs/xfs/
files, teach the diff tool to try fs/xfs/xfs_foo.c if
fs/xfs/libxfs/xfs_foo.c doesn't exist.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tools/libxfs-diff |    1 +
 1 file changed, 1 insertion(+)

Comments

Eric Sandeen June 20, 2019, 7:53 p.m. UTC | #1 
On 6/20/19 11:50 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Now that we're syncing userspace libxfs/ files with kernel fs/xfs/
> files, teach the diff tool to try fs/xfs/xfs_foo.c if
> fs/xfs/libxfs/xfs_foo.c doesn't exist.

do we really need this or should I just send a patch for the kernel
to move it?

-Eric

> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tools/libxfs-diff |    1 +
>  1 file changed, 1 insertion(+)
> 
> 
> diff --git a/tools/libxfs-diff b/tools/libxfs-diff
> index fa57c004..c18ad487 100755
> --- a/tools/libxfs-diff
> +++ b/tools/libxfs-diff
> @@ -22,5 +22,6 @@ dir="$(readlink -m "${dir}/..")"
>  
>  for i in libxfs/xfs*.[ch]; do
>  	kfile="${dir}/$i"
> +	test -f "${kfile}" || kfile="$(echo "${kfile}" | sed -e 's|libxfs/||g')"
>  	diff -Naurpw --label "$i" <(sed -e '/#include/d' "$i") --label "${kfile}" <(sed -e '/#include/d' "${kfile}")
>  done
>
Darrick J. Wong June 20, 2019, 7:57 p.m. UTC | #2 
On Thu, Jun 20, 2019 at 02:53:14PM -0500, Eric Sandeen wrote:
> On 6/20/19 11:50 AM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Now that we're syncing userspace libxfs/ files with kernel fs/xfs/
> > files, teach the diff tool to try fs/xfs/xfs_foo.c if
> > fs/xfs/libxfs/xfs_foo.c doesn't exist.
> 
> do we really need this or should I just send a patch for the kernel
> to move it?

Nah just send a kernel patch.

--D

> -Eric
> 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tools/libxfs-diff |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > 
> > diff --git a/tools/libxfs-diff b/tools/libxfs-diff
> > index fa57c004..c18ad487 100755
> > --- a/tools/libxfs-diff
> > +++ b/tools/libxfs-diff
> > @@ -22,5 +22,6 @@ dir="$(readlink -m "${dir}/..")"
> >  
> >  for i in libxfs/xfs*.[ch]; do
> >  	kfile="${dir}/$i"
> > +	test -f "${kfile}" || kfile="$(echo "${kfile}" | sed -e 's|libxfs/||g')"
> >  	diff -Naurpw --label "$i" <(sed -e '/#include/d' "$i") --label "${kfile}" <(sed -e '/#include/d' "${kfile}")
> >  done
> >
diff mbox series

Patch

diff --git a/tools/libxfs-diff b/tools/libxfs-diff
index fa57c004..c18ad487 100755
--- a/tools/libxfs-diff
+++ b/tools/libxfs-diff
@@ -22,5 +22,6 @@  dir="$(readlink -m "${dir}/..")"
 
 for i in libxfs/xfs*.[ch]; do
 	kfile="${dir}/$i"
+	test -f "${kfile}" || kfile="$(echo "${kfile}" | sed -e 's|libxfs/||g')"
 	diff -Naurpw --label "$i" <(sed -e '/#include/d' "$i") --label "${kfile}" <(sed -e '/#include/d' "${kfile}")
 done