| Message ID | 20250318095410.198438-1-yuka@yuka.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mkfs: fix build on 32-bit platforms | expand |
On 2025-03-18 10:53:35, Yureka Lilian wrote: > Fixes "proto.c:1136:1: error: conflicting types for 'filesize'; have 'off_t(int)' {aka 'long long int(int)'}" > > Fixes: 73fb78e5 > Signed-off-by: Yureka Lilian <yuka@yuka.dev> > --- > mkfs/proto.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mkfs/proto.c b/mkfs/proto.c > index 6dd3a200..981f5b11 100644 > --- a/mkfs/proto.c > +++ b/mkfs/proto.c > @@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks); > static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len); > static int newregfile(char **pp, char **fname); > static void rtinit(xfs_mount_t *mp); > -static long filesize(int fd); > +static off_t filesize(int fd); > static int slashes_are_spaces; > > /* > -- > 2.48.1 > > Already fixed in for-next branch [1]. Will be in next release [1]: https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?h=for-next&id=a5466cee9874412cfdd187f07c5276e1d4ef0fea
diff --git a/mkfs/proto.c b/mkfs/proto.c index 6dd3a200..981f5b11 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks); static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len); static int newregfile(char **pp, char **fname); static void rtinit(xfs_mount_t *mp); -static long filesize(int fd); +static off_t filesize(int fd); static int slashes_are_spaces; /*
Fixes "proto.c:1136:1: error: conflicting types for 'filesize'; have 'off_t(int)' {aka 'long long int(int)'}" Fixes: 73fb78e5 Signed-off-by: Yureka Lilian <yuka@yuka.dev> --- mkfs/proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)