From: Fan Yong Date: Sat, 29 Aug 2015 00:15:55 +0000 (+0800) Subject: LU-6895 lfsck: conflict lu_dirent_attrs members X-Git-Tag: 2.7.63~45 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F16821%2F4;p=fs%2Flustre-release.git LU-6895 lfsck: conflict lu_dirent_attrs members It is by wrong that the LUDA_UNKNOWN is defined the same value as LUDA_UPGRADE. Signed-off-by: Fan Yong Change-Id: I4067d7852166fab77df69736b3a160e9f67a6abc Reviewed-on: http://review.whamcloud.com/16821 Reviewed-by: Alex Zhuravlev Reviewed-by: John L. Hammond Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 1de86e6..14b5816 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -894,21 +894,21 @@ enum lu_dirent_attrs { /* The following attrs are used for MDT internal only, * not visible to client */ - /* Verify the dirent consistency */ - LUDA_VERIFY = 0x8000, - /* Only check but not repair the dirent inconsistency */ - LUDA_VERIFY_DRYRUN = 0x4000, - /* The dirent has been repaired, or to be repaired (dryrun). */ - LUDA_REPAIR = 0x2000, - /* The system is upgraded, has beed or to be repaired (dryrun). */ - LUDA_UPGRADE = 0x1000, + /* Something in the record is unknown, to be verified in further. */ + LUDA_UNKNOWN = 0x0400, /* Ignore this record, go to next directly. */ LUDA_IGNORE = 0x0800, - /* Something in the record is unknown, to be verified in further. */ - LUDA_UNKNOWN = 0x1000, + /* The system is upgraded, has beed or to be repaired (dryrun). */ + LUDA_UPGRADE = 0x1000, + /* The dirent has been repaired, or to be repaired (dryrun). */ + LUDA_REPAIR = 0x2000, + /* Only check but not repair the dirent inconsistency */ + LUDA_VERIFY_DRYRUN = 0x4000, + /* Verify the dirent consistency */ + LUDA_VERIFY = 0x8000, }; -#define LU_DIRENT_ATTRS_MASK 0xf800 +#define LU_DIRENT_ATTRS_MASK 0xff00 /** * Layout of readdir pages, as transmitted on wire.