LU-7437 utils: continue on errors in lctl {get,set}_param

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index 62543f8..527eb79 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -332,6 +332,9 @@ struct osd_object {
        enum osd_destroy_type    oo_destroy;
 
        __u32                    oo_destroyed:1;
+
+       /* the i_flags in LMA */
+       __u32                    oo_lma_flags;
        /* record size for index file */
        unsigned char            oo_keysize;
        unsigned char            oo_recsize;
@@ -530,16 +533,16 @@ osd_xattr_set_internal(const struct lu_env *env, struct osd_object *obj,
 
 static inline uint64_t attrs_fs2zfs(const uint32_t flags)
 {
-       return (((flags & FS_APPEND_FL)         ? ZFS_APPENDONLY        : 0) |
-               ((flags & FS_NODUMP_FL)         ? ZFS_NODUMP            : 0) |
-               ((flags & FS_IMMUTABLE_FL)      ? ZFS_IMMUTABLE         : 0));
+       return (flags & LUSTRE_APPEND_FL        ? ZFS_APPENDONLY        : 0) |
+               (flags & LUSTRE_NODUMP_FL       ? ZFS_NODUMP            : 0) |
+               (flags & LUSTRE_IMMUTABLE_FL    ? ZFS_IMMUTABLE         : 0);
 }
 
 static inline uint32_t attrs_zfs2fs(const uint64_t flags)
 {
-       return (((flags & ZFS_APPENDONLY)       ? FS_APPEND_FL          : 0) |
-               ((flags & ZFS_NODUMP)           ? FS_NODUMP_FL          : 0) |
-               ((flags & ZFS_IMMUTABLE)        ? FS_IMMUTABLE_FL       : 0));
+       return (flags & ZFS_APPENDONLY  ? LUSTRE_APPEND_FL      : 0) |
+               (flags & ZFS_NODUMP     ? LUSTRE_NODUMP_FL      : 0) |
+               (flags & ZFS_IMMUTABLE  ? LUSTRE_IMMUTABLE_FL   : 0);
 }
 
 #endif