Skip to content

fs/lustre: Remove unneeded includes#8512

Merged
edgargabriel merged 1 commit intoopen-mpi:masterfrom
bertwesarg:fix-lustre-2.14
Feb 23, 2021
Merged

fs/lustre: Remove unneeded includes#8512
edgargabriel merged 1 commit intoopen-mpi:masterfrom
bertwesarg:fix-lustre-2.14

Conversation

@bertwesarg
Copy link
Copy Markdown
Member

The functionality was migrated to fs/base/fs_base_get_parent_dir.c long
ago, but the includes stayed. Though with lustre 2.14 the lustre_uer.h
moved its include from linux/fs.h outside the __KERNEL__ guard. This
now triggered the Debian bug #898743 [1], which states that including
sys/mount.h after linux/fs.h breaks compilation. Thus the include
removal also avoids this breakage.

Closes #8508.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898743

Signed-off-by: Bert Wesarg bert.wesarg@tu-dresden.de

@bertwesarg
Copy link
Copy Markdown
Member Author

bertwesarg commented Feb 23, 2021

Can a maintainer please label this PR appropriately, also for the backports to label: v40 and label: v41. Thanks.

@edgargabriel
Copy link
Copy Markdown
Member

@bertwesarg would you like to commit this or shall I go and press the button?

@jsquyres
Copy link
Copy Markdown
Member

ok to test

@bertwesarg
Copy link
Copy Markdown
Member Author

@bertwesarg would you like to commit this or shall I go and press the button?

I do not have the permissions. I also would like to fix a typo in the commit message

The functionality was migrated to `fs/base/fs_base_get_parent_dir.c` long
ago, but the includes stayed. Though in lustre 2.14 `lustre_user.h`
moved the inclusion of `linux/fs.h` outside the `__KERNEL__` guard. This
triggered now Debian bug #898743 [1], which states that including
`sys/mount.h` after `linux/fs.h` breaks compilation. Thus the include
removal also avoids this breakage.

Closes open-mpi#8508.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898743

Signed-off-by: Bert Wesarg <bert.wesarg@tu-dresden.de>
@jsquyres
Copy link
Copy Markdown
Member

bot:ompi:retest

@edgargabriel edgargabriel merged commit 674d831 into open-mpi:master Feb 23, 2021
@edgargabriel
Copy link
Copy Markdown
Member

I will create the pr's for the 4.0 and 4.1 branches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build with lustre headers breaks Open MPI

4 participants