Skip to content

Commit 3df4e64

Browse files
committed
Merge branch 'aufs5.2/00base' into aufs5.3/00base
2 parents b1812b9 + bdaa9c7 commit 3df4e64

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

fs/aufs/dir.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct au_nhash {
2525

2626
struct au_vdir_destr {
2727
unsigned char len;
28-
unsigned char name[0];
28+
unsigned char name[];
2929
} __packed;
3030

3131
struct au_vdir_dehstr {

fs/aufs/dirren.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ struct au_drinfo_rev_elm {
571571
struct au_drinfo_rev {
572572
unsigned char already;
573573
aufs_bindex_t nelm;
574-
struct au_drinfo_rev_elm elm[0];
574+
struct au_drinfo_rev_elm elm[];
575575
};
576576

577577
/* todo: isn't it too large? */

include/uapi/linux/aufs_type.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ struct au_rdu_ent {
274274
uint8_t type;
275275
uint8_t nlen;
276276
uint8_t wh;
277-
char name[0];
277+
char name[];
278278
} __aligned(8);
279279

280280
static inline int au_rdu_len(int nlen)
@@ -325,7 +325,7 @@ struct au_drinfo {
325325
uint8_t oldnamelen;
326326
uint64_t _padding;
327327
};
328-
uint8_t oldname[0];
328+
uint8_t oldname[];
329329
} __aligned(8);
330330

331331
struct au_drinfo_fdata {
@@ -419,7 +419,7 @@ union aufs_brinfo {
419419
struct {
420420
int16_t id;
421421
int perm;
422-
char path[0];
422+
char path[];
423423
};
424424
} __aligned(8);
425425

0 commit comments

Comments
 (0)