Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define timestruc_t for Lustre compatibility #8014

Merged
merged 1 commit into from Oct 12, 2018

Conversation

Projects
3 participants
@tonyhutter
Copy link
Member

commented Oct 11, 2018

Motivation and Context

Allow lustre to build against zfs

Description

Lustre 2.8 (and possibly other versions) are still using timestruc_t, which was removed in spl-0.7.10 in favour of inode_timespec_t. Add in a backwards compatibility #define for timestruc_t so that Lustre builds.

Signed-off-by: Tony Hutter hutter2@llnl.gov

How Has This Been Tested?

Verified lustre built. This patch has been in the LLNL ZFS branch for the last three weeks (https://github.com/LLNL/zfs/releases/tag/zfs-0.7.11-2llnl).

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.
@codecov

This comment has been minimized.

Copy link

commented Oct 12, 2018

Codecov Report

Merging #8014 into master will decrease coverage by 0.21%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8014      +/-   ##
==========================================
- Coverage   78.55%   78.33%   -0.22%     
==========================================
  Files         377      377              
  Lines      114165   114213      +48     
==========================================
- Hits        89678    89466     -212     
- Misses      24487    24747     +260
Flag Coverage Δ
#kernel 78.72% <ø> (-0.01%) ⬇️
#user 67.29% <ø> (-0.32%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d43cc9...94b7768. Read the comment docs.

@gmelikov
Copy link
Member

left a comment

LGTM

@@ -66,6 +66,9 @@ typedef struct timespec64 inode_timespec_t;
typedef struct timespec inode_timespec_t;
#endif

/* Include for Lustre compatibility */
#define timestruc_t inode_timespec_t

This comment has been minimized.

Copy link
@behlendorf

behlendorf Oct 12, 2018

Member

nit: there's a small cstyle issue.

This comment has been minimized.

Copy link
@tonyhutter

tonyhutter Oct 12, 2018

Author Member

Thanks, fixed in my latest push

Define timestruc_t for Lustre compatibility
Lustre 2.8 (and possibly other versions) are still using timestruc_t,
which was removed in spl-0.7.10 in favor of inode_timespec_t.  Add
in a backwards compatibility #define for timestruc_t so that Lustre
builds.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>

@tonyhutter tonyhutter force-pushed the tonyhutter:timestruct_lustre branch from 74a90d6 to 94b7768 Oct 12, 2018

@behlendorf behlendorf merged commit 3c94dd7 into zfsonlinux:master Oct 12, 2018

12 of 22 checks passed

buildbot/Amazon 2 x86_64 Release (TEST) Build started.
Details
buildbot/CentOS 6 x86_64 (TEST) Build started.
Details
buildbot/CentOS 7 x86_64 (TEST) Build started.
Details
buildbot/Debian 8 ppc64 (BUILD) Build started.
Details
buildbot/Debian 9 x86_64 (TEST) Build started.
Details
buildbot/Fedora 28 x86_64 (TEST) Build started.
Details
buildbot/Ubuntu 16.04 x86_64 (BUILD) Build started.
Details
buildbot/Ubuntu 16.04 x86_64 (TEST) Build started.
Details
buildbot/Ubuntu 17.04 x86_64 Coverage (TEST) Build started.
Details
buildbot/Ubuntu 18.04 x86_64 (TEST) Build started.
Details
buildbot/Amazon 2 x86_64 (BUILD) Build done.
Details
buildbot/CentOS 6 x86_64 (BUILD) Build done.
Details
buildbot/CentOS 7 x86_64 (BUILD) Build done.
Details
buildbot/Debian 8 arm (BUILD) Build done.
Details
buildbot/Debian 8 ppc (BUILD) Build done.
Details
buildbot/Debian 9 x86_64 (BUILD) Build done.
Details
buildbot/Fedora 28 x86_64 (BUILD) Build done.
Details
buildbot/Kernel.org Built-in x86_64 (BUILD) Build done.
Details
buildbot/Ubuntu 16.04 aarch64 (BUILD) Build done.
Details
buildbot/Ubuntu 16.04 i386 (BUILD) Build done.
Details
buildbot/Ubuntu 17.10 x86_64 (STYLE) Build done.
Details
buildbot/Ubuntu 18.04 x86_64 (BUILD) Build done.
Details

@tonyhutter tonyhutter added this to To do in 0.7.12 Oct 25, 2018

@tonyhutter tonyhutter moved this from To do to In progress in 0.7.12 Oct 26, 2018

ghfields added a commit to ghfields/zfs that referenced this pull request Oct 29, 2018

Define timestruc_t for Lustre compatibility
Lustre 2.8 (and possibly other versions) are still using timestruc_t,
which was removed in spl-0.7.10 in favor of inode_timespec_t.  Add
in a backwards compatibility #define for timestruc_t so that Lustre
builds.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes zfsonlinux#8014

GregorKopka pushed a commit to GregorKopka/zfs that referenced this pull request Jan 7, 2019

Define timestruc_t for Lustre compatibility
Lustre 2.8 (and possibly other versions) are still using timestruc_t,
which was removed in spl-0.7.10 in favor of inode_timespec_t.  Add
in a backwards compatibility #define for timestruc_t so that Lustre
builds.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes zfsonlinux#8014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.