* [PATCH 1/6] invutil/invidx: include <fcntl.h> for O_CREAT
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 7:59 ` Christoph Hellwig
2016-01-12 21:08 ` [PATCH 2/6] dump/content.c: Include <linux/limits.h> for XATTR_LIST_MAX Felix Janda
` (4 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
invutil/invidx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/invutil/invidx.c b/invutil/invidx.c
index 67efdf7..82d89d9 100644
--- a/invutil/invidx.c
+++ b/invutil/invidx.c
@@ -20,6 +20,7 @@
#include <xfs/jdm.h>
#include <stdio.h>
+#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <ncurses.h>
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/6] dump/content.c: Include <linux/limits.h> for XATTR_LIST_MAX
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
2016-01-12 21:08 ` [PATCH 1/6] invutil/invidx: include <fcntl.h> for O_CREAT Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 7:59 ` Christoph Hellwig
2016-01-12 21:08 ` [PATCH 3/6] common/main.c: Replace nonstandard SIGCLD by SIGCHLD Felix Janda
` (3 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
dump/content.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dump/content.c b/dump/content.c
index 1e86292..97e42ab 100644
--- a/dump/content.c
+++ b/dump/content.c
@@ -36,6 +36,7 @@
#include <xfs/xfs.h>
#include <xfs/jdm.h>
#ifdef linux
+#include <linux/limits.h>
#include <xfs/xqm.h>
#endif
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/6] common/main.c: Replace nonstandard SIGCLD by SIGCHLD
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
2016-01-12 21:08 ` [PATCH 1/6] invutil/invidx: include <fcntl.h> for O_CREAT Felix Janda
2016-01-12 21:08 ` [PATCH 2/6] dump/content.c: Include <linux/limits.h> for XATTR_LIST_MAX Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 7:59 ` Christoph Hellwig
2016-01-12 21:08 ` [PATCH 4/6] librmt/rmtopen: Prefer <signal.h> over <sys/signal.h> Felix Janda
` (2 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
common/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/main.c b/common/main.c
index 3848499..faa66ee 100644
--- a/common/main.c
+++ b/common/main.c
@@ -2225,7 +2225,7 @@ static sig_printmap_t sig_printmap[ ] = {
{SIGTERM, "SIGTERM"},
{SIGUSR1, "SIGUSR1"},
{SIGUSR2, "SIGUSR2"},
- {SIGCLD, "SIGCLD"},
+ {SIGCHLD, "SIGCHLD"},
{SIGPWR, "SIGPWR"},
{SIGURG, "SIGURG"},
{SIGPOLL, "SIGPOLL"},
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/6] librmt/rmtopen: Prefer <signal.h> over <sys/signal.h>
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
` (2 preceding siblings ...)
2016-01-12 21:08 ` [PATCH 3/6] common/main.c: Replace nonstandard SIGCLD by SIGCHLD Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 8:00 ` Christoph Hellwig
2016-01-12 21:08 ` [PATCH 5/6] dump/var.c: Include <limits.h> for PATH_MAX Felix Janda
2016-01-12 21:08 ` [PATCH 6/6] Prefer stdint types over __uint*_t and __int*_t Felix Janda
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
librmt/rmtopen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/librmt/rmtopen.c b/librmt/rmtopen.c
index 4bf9383..09ba3e4 100644
--- a/librmt/rmtopen.c
+++ b/librmt/rmtopen.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/6] dump/var.c: Include <limits.h> for PATH_MAX
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
` (3 preceding siblings ...)
2016-01-12 21:08 ` [PATCH 4/6] librmt/rmtopen: Prefer <signal.h> over <sys/signal.h> Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 8:00 ` Christoph Hellwig
2016-01-12 21:08 ` [PATCH 6/6] Prefer stdint types over __uint*_t and __int*_t Felix Janda
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
dump/var.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dump/var.c b/dump/var.c
index 645caab..6e3ead0 100644
--- a/dump/var.c
+++ b/dump/var.c
@@ -22,6 +22,7 @@
#include <errno.h>
#include <dirent.h>
#include <string.h>
+#include <limits.h>
#include <uuid/uuid.h>
#include "config.h"
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/6] Prefer stdint types over __uint*_t and __int*_t
2016-01-12 21:04 [PATCH 0/6] xfsdump: Compile with musl libc Felix Janda
` (4 preceding siblings ...)
2016-01-12 21:08 ` [PATCH 5/6] dump/var.c: Include <limits.h> for PATH_MAX Felix Janda
@ 2016-01-12 21:08 ` Felix Janda
2016-01-13 8:01 ` Christoph Hellwig
5 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-12 21:08 UTC (permalink / raw)
To: xfs
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
common/content_inode.h | 4 ++--
common/hsmapi.c | 2 +-
doc/xfsdump.html | 8 ++++----
inventory/inv_oref.h | 2 +-
inventory/inv_priv.h | 4 ++--
inventory/inventory.h | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/content_inode.h b/common/content_inode.h
index a69a9a0..6936e05 100644
--- a/common/content_inode.h
+++ b/common/content_inode.h
@@ -191,10 +191,10 @@ typedef struct bstat bstat_t;
* and using two 16bit values to hold new 32bit projid was choosen
* to retain compatibility with "old" filesystems).
*/
-static inline __uint32_t
+static inline uint32_t
bstat_projid(struct bstat *bs)
{
- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
}
diff --git a/common/hsmapi.c b/common/hsmapi.c
index 6054773..515d392 100644
--- a/common/hsmapi.c
+++ b/common/hsmapi.c
@@ -585,7 +585,7 @@ HsmModifyExtentMap(
struct getbmapx *bmap)
{
dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp;
- __int64_t length;
+ int64_t length;
if (bmap[0].bmv_entries <= 0) {
return 1; /* caller must already be at EOF */
diff --git a/doc/xfsdump.html b/doc/xfsdump.html
index 9c6722e..f85128f 100644
--- a/doc/xfsdump.html
+++ b/doc/xfsdump.html
@@ -1935,7 +1935,7 @@ The files are constructed like so:
<pre>
typedef struct invt_counter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -1975,7 +1975,7 @@ typedef struct invt_fstab {
<pre>
typedef struct invt_counter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2012,7 +2012,7 @@ typedef struct invt_entry {
<pre>
typedef struct invt_sescounter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr {
off64_t sh_streams_off; /* offset to start of the set of
stream hdrs */
time_t sh_time; /* time of the dump */
- __uint32_t sh_flag; /* for misc flags */
+ uint32_t sh_flag; /* for misc flags */
u_char sh_level; /* dump level */
u_char sh_pruned; /* pruned by invutil flag */
char sh_padding[22];
diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h
index e16684d..38303a4 100644
--- a/inventory/inv_oref.h
+++ b/inventory/inv_oref.h
@@ -46,7 +46,7 @@
-typedef __uint32_t invt_objtype_t;
+typedef uint32_t invt_objtype_t;
#define INVT_LOCKED 0x0001
diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h
index 1690271..364ffbc 100644
--- a/inventory/inv_priv.h
+++ b/inventory/inv_priv.h
@@ -120,7 +120,7 @@ typedef struct invt_seshdr {
off64_t sh_streams_off; /* offset to start of the set of
stream hdrs */
time32_t sh_time; /* time of the dump */
- __uint32_t sh_flag; /* for misc flags */
+ uint32_t sh_flag; /* for misc flags */
u_char sh_level; /* dump level */
u_char sh_pruned; /* pruned by invutil flag */
char sh_padding[22];
@@ -184,7 +184,7 @@ typedef struct invt_entry {
/* Cheap Inheritance, and an attempt to avoid a nested type */
#define INVT_COUNTER_FIELDS \
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
uint ic_curnum;/* number of sessions/invindices recorded \
so far */ \
uint ic_maxnum;/* maximum number of sessions/inv_indices \
diff --git a/inventory/inventory.h b/inventory/inventory.h
index 134b9ba..c1d7403 100644
--- a/inventory/inventory.h
+++ b/inventory/inventory.h
@@ -43,7 +43,7 @@
/* length of labels, mntpts, etc */
#define INV_STRLEN GLOBAL_HDR_STRING_SZ
-typedef __uint32_t inv_version_t;
+typedef uint32_t inv_version_t;
/* This is the general inventory version.
*/
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 6/6] Prefer stdint types over __uint*_t and __int*_t
2016-01-12 21:08 ` [PATCH 6/6] Prefer stdint types over __uint*_t and __int*_t Felix Janda
@ 2016-01-13 8:01 ` Christoph Hellwig
2016-01-13 17:51 ` [PATCH v2] cleanup: Kill __[u]int*_t types Felix Janda
0 siblings, 1 reply; 15+ messages in thread
From: Christoph Hellwig @ 2016-01-13 8:01 UTC (permalink / raw)
To: Felix Janda; +Cc: xfs
> dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp;
> - __int64_t length;
> + int64_t length;
>
> if (bmap[0].bmv_entries <= 0) {
> return 1; /* caller must already be at EOF */
> diff --git a/doc/xfsdump.html b/doc/xfsdump.html
> index 9c6722e..f85128f 100644
> --- a/doc/xfsdump.html
> +++ b/doc/xfsdump.html
> @@ -1935,7 +1935,7 @@ The files are constructed like so:
> <pre>
> typedef struct invt_counter {
> INVT_COUNTER_FIELDS
> - __uint32_t ic_vernum;/* on disk version number for posterity */\
> + uint32_t ic_vernum;/* on disk version number for posterity */\
please keep the existing alignments for variable declarations or
structure members.
Otherwise this looks fine:
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH v2] cleanup: Kill __[u]int*_t types
2016-01-13 8:01 ` Christoph Hellwig
@ 2016-01-13 17:51 ` Felix Janda
2016-01-14 10:20 ` Christoph Hellwig
0 siblings, 1 reply; 15+ messages in thread
From: Felix Janda @ 2016-01-13 17:51 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
Replace them by the stdint [u]int*_t types.
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
v2: fix alignmentation
---
common/content_inode.h | 4 ++--
common/hsmapi.c | 2 +-
doc/xfsdump.html | 8 ++++----
inventory/inv_oref.h | 2 +-
inventory/inv_priv.h | 4 ++--
inventory/inventory.h | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/content_inode.h b/common/content_inode.h
index a69a9a0..6936e05 100644
--- a/common/content_inode.h
+++ b/common/content_inode.h
@@ -191,10 +191,10 @@ typedef struct bstat bstat_t;
* and using two 16bit values to hold new 32bit projid was choosen
* to retain compatibility with "old" filesystems).
*/
-static inline __uint32_t
+static inline uint32_t
bstat_projid(struct bstat *bs)
{
- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
}
diff --git a/common/hsmapi.c b/common/hsmapi.c
index 6054773..0709dbe 100644
--- a/common/hsmapi.c
+++ b/common/hsmapi.c
@@ -585,7 +585,7 @@ HsmModifyExtentMap(
struct getbmapx *bmap)
{
dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp;
- __int64_t length;
+ int64_t length;
if (bmap[0].bmv_entries <= 0) {
return 1; /* caller must already be at EOF */
diff --git a/doc/xfsdump.html b/doc/xfsdump.html
index 9c6722e..8cc02d4 100644
--- a/doc/xfsdump.html
+++ b/doc/xfsdump.html
@@ -1935,7 +1935,7 @@ The files are constructed like so:
<pre>
typedef struct invt_counter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -1975,7 +1975,7 @@ typedef struct invt_fstab {
<pre>
typedef struct invt_counter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2012,7 +2012,7 @@ typedef struct invt_entry {
<pre>
typedef struct invt_sescounter {
INVT_COUNTER_FIELDS
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
u_int ic_curnum;/* number of sessions/invindices recorded \
so far */ \
u_int ic_maxnum;/* maximum number of sessions/inv_indices \
@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr {
off64_t sh_streams_off; /* offset to start of the set of
stream hdrs */
time_t sh_time; /* time of the dump */
- __uint32_t sh_flag; /* for misc flags */
+ uint32_t sh_flag; /* for misc flags */
u_char sh_level; /* dump level */
u_char sh_pruned; /* pruned by invutil flag */
char sh_padding[22];
diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h
index e16684d..38303a4 100644
--- a/inventory/inv_oref.h
+++ b/inventory/inv_oref.h
@@ -46,7 +46,7 @@
-typedef __uint32_t invt_objtype_t;
+typedef uint32_t invt_objtype_t;
#define INVT_LOCKED 0x0001
diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h
index 1690271..157e1dd 100644
--- a/inventory/inv_priv.h
+++ b/inventory/inv_priv.h
@@ -120,7 +120,7 @@ typedef struct invt_seshdr {
off64_t sh_streams_off; /* offset to start of the set of
stream hdrs */
time32_t sh_time; /* time of the dump */
- __uint32_t sh_flag; /* for misc flags */
+ uint32_t sh_flag; /* for misc flags */
u_char sh_level; /* dump level */
u_char sh_pruned; /* pruned by invutil flag */
char sh_padding[22];
@@ -184,7 +184,7 @@ typedef struct invt_entry {
/* Cheap Inheritance, and an attempt to avoid a nested type */
#define INVT_COUNTER_FIELDS \
- __uint32_t ic_vernum;/* on disk version number for posterity */\
+ uint32_t ic_vernum;/* on disk version number for posterity */\
uint ic_curnum;/* number of sessions/invindices recorded \
so far */ \
uint ic_maxnum;/* maximum number of sessions/inv_indices \
diff --git a/inventory/inventory.h b/inventory/inventory.h
index 134b9ba..c1d7403 100644
--- a/inventory/inventory.h
+++ b/inventory/inventory.h
@@ -43,7 +43,7 @@
/* length of labels, mntpts, etc */
#define INV_STRLEN GLOBAL_HDR_STRING_SZ
-typedef __uint32_t inv_version_t;
+typedef uint32_t inv_version_t;
/* This is the general inventory version.
*/
--
2.4.10
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 15+ messages in thread