| Message ID | 20210802215024.949616-3-preichl@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | xfsprogs: Drop the 'platform_' prefix | expand |
On Mon, Aug 02, 2021 at 11:50:18PM +0200, Pavel Reichl wrote: > No other platform then linux is supported so rename to something more > common. > --- > copy/xfs_copy.c | 2 +- > libfrog/{platform.h => common.h} | 0 This is confusing, we already have a scrub/common.h. Renaming files breaks git blame; why change them? --D > libfrog/topology.c | 2 +- > libxfs/init.c | 2 +- > libxfs/rdwr.c | 2 +- > repair/xfs_repair.c | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename libfrog/{platform.h => common.h} (100%) > > diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c > index fc7d225f..c80b42d1 100644 > --- a/copy/xfs_copy.c > +++ b/copy/xfs_copy.c > @@ -12,7 +12,7 @@ > #include <stdarg.h> > #include "xfs_copy.h" > #include "libxlog.h" > -#include "libfrog/platform.h" > +#include "libfrog/common.h" > > #define rounddown(x, y) (((x)/(y))*(y)) > #define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0) > diff --git a/libfrog/platform.h b/libfrog/common.h > similarity index 100% > rename from libfrog/platform.h > rename to libfrog/common.h > diff --git a/libfrog/topology.c b/libfrog/topology.c > index b1b470c9..b059829e 100644 > --- a/libfrog/topology.c > +++ b/libfrog/topology.c > @@ -11,7 +11,7 @@ > #endif /* ENABLE_BLKID */ > #include "xfs_multidisk.h" > #include "topology.h" > -#include "platform.h" > +#include "common.h" > > #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) > #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) > diff --git a/libxfs/init.c b/libxfs/init.c > index 1ec83791..d1e87002 100644 > --- a/libxfs/init.c > +++ b/libxfs/init.c > @@ -21,7 +21,7 @@ > #include "xfs_trans.h" > #include "xfs_rmap_btree.h" > #include "xfs_refcount_btree.h" > -#include "libfrog/platform.h" > +#include "libfrog/common.h" > > #include "libxfs.h" /* for now */ > > diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c > index fd456d6b..f8e4cf0a 100644 > --- a/libxfs/rdwr.c > +++ b/libxfs/rdwr.c > @@ -17,7 +17,7 @@ > #include "xfs_inode_fork.h" > #include "xfs_inode.h" > #include "xfs_trans.h" > -#include "libfrog/platform.h" > +#include "libfrog/common.h" > > #include "libxfs.h" > > diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c > index 38406eea..af24b356 100644 > --- a/repair/xfs_repair.c > +++ b/repair/xfs_repair.c > @@ -23,7 +23,7 @@ > #include "slab.h" > #include "rmap.h" > #include "libfrog/fsgeom.h" > -#include "libfrog/platform.h" > +#include "libfrog/common.h" > #include "bulkload.h" > #include "quotacheck.h" > > -- > 2.31.1 >
On 8/3/21 12:33 AM, Darrick J. Wong wrote: > On Mon, Aug 02, 2021 at 11:50:18PM +0200, Pavel Reichl wrote: >> No other platform then linux is supported so rename to something more >> common. >> --- >> copy/xfs_copy.c | 2 +- >> libfrog/{platform.h => common.h} | 0 > This is confusing, we already have a scrub/common.h. Renaming files > breaks git blame; why change them? > I wanted to rename the file because it contains functions that were supposed to be multi-platform (at least that's my understanding) but it never became the case. So since we are trying to get rid of the obsolete 'platform_' prefix I thought that more proper name for the file should be chosen. However, I respect the git blame consideration and I'm fine with keeping the name.
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index fc7d225f..c80b42d1 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -12,7 +12,7 @@ #include <stdarg.h> #include "xfs_copy.h" #include "libxlog.h" -#include "libfrog/platform.h" +#include "libfrog/common.h" #define rounddown(x, y) (((x)/(y))*(y)) #define uuid_equal(s,d) (platform_uuid_compare((s),(d)) == 0) diff --git a/libfrog/platform.h b/libfrog/common.h similarity index 100% rename from libfrog/platform.h rename to libfrog/common.h diff --git a/libfrog/topology.c b/libfrog/topology.c index b1b470c9..b059829e 100644 --- a/libfrog/topology.c +++ b/libfrog/topology.c @@ -11,7 +11,7 @@ #endif /* ENABLE_BLKID */ #include "xfs_multidisk.h" #include "topology.h" -#include "platform.h" +#include "common.h" #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) diff --git a/libxfs/init.c b/libxfs/init.c index 1ec83791..d1e87002 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -21,7 +21,7 @@ #include "xfs_trans.h" #include "xfs_rmap_btree.h" #include "xfs_refcount_btree.h" -#include "libfrog/platform.h" +#include "libfrog/common.h" #include "libxfs.h" /* for now */ diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index fd456d6b..f8e4cf0a 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -17,7 +17,7 @@ #include "xfs_inode_fork.h" #include "xfs_inode.h" #include "xfs_trans.h" -#include "libfrog/platform.h" +#include "libfrog/common.h" #include "libxfs.h" diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index 38406eea..af24b356 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -23,7 +23,7 @@ #include "slab.h" #include "rmap.h" #include "libfrog/fsgeom.h" -#include "libfrog/platform.h" +#include "libfrog/common.h" #include "bulkload.h" #include "quotacheck.h"
No other platform then linux is supported so rename to something more common. --- copy/xfs_copy.c | 2 +- libfrog/{platform.h => common.h} | 0 libfrog/topology.c | 2 +- libxfs/init.c | 2 +- libxfs/rdwr.c | 2 +- repair/xfs_repair.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename libfrog/{platform.h => common.h} (100%)