Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1715556 > unrolled thread
| Started by | James Simmons <jsimmons@infradead.org> |
|---|---|
| First post | 2017-08-19 05:10 +0200 |
| Last post | 2017-08-19 05:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] staging: lustre: uapi: properly include lustre_errno.h James Simmons <jsimmons@infradead.org> - 2017-08-19 05:10 +0200
Re: [PATCH] staging: lustre: uapi: properly include lustre_errno.h Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-19 05:50 +0200
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Date | 2017-08-19 05:10 +0200 |
| Subject | [PATCH] staging: lustre: uapi: properly include lustre_errno.h |
| Message-ID | <ug2j8-4jT-9@gated-at.bofh.it> |
The path for lustre_errno.h was not updated to the new path for errno.c. Also the header lustre_net.h uses code found in lustre_errno.h but doesn't include the header directly. It is easy to forget to add the header lustre_errno.h before including lustre_net.h so it is just easier to include lustre_errno.h in lustre_net.h. This should resolve the build issues seen on the ia64 platform. Signed-off-by: James Simmons <jsimmons@infradead.org> --- drivers/staging/lustre/lustre/include/lustre_net.h | 1 + drivers/staging/lustre/lustre/ptlrpc/errno.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h index 1ae7e83..bc18131 100644 --- a/drivers/staging/lustre/lustre/include/lustre_net.h +++ b/drivers/staging/lustre/lustre/include/lustre_net.h @@ -55,6 +55,7 @@ #include "../../include/uapi/linux/lnet/nidstr.h" #include "../../include/linux/lnet/api.h" #include "../../include/uapi/linux/lustre/lustre_idl.h" +#include "lustre_errno.h" #include "lustre_ha.h" #include "lustre_sec.h" #include "lustre_import.h" diff --git a/drivers/staging/lustre/lustre/ptlrpc/errno.c b/drivers/staging/lustre/lustre/ptlrpc/errno.c index 73f8374..faad8d8 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/errno.c +++ b/drivers/staging/lustre/lustre/ptlrpc/errno.c @@ -26,7 +26,7 @@ */ #include "../../include/linux/libcfs/libcfs.h" -#include "../include/lustre/lustre_errno.h" +#include "../include/lustre_errno.h" /* * The two translation tables below must define a one-to-one mapping between -- 1.8.3.1
[toc] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-08-19 05:50 +0200 |
| Message-ID | <ug2VP-4xH-1@gated-at.bofh.it> |
| In reply to | #1715556 |
On Fri, Aug 18, 2017 at 11:04:14PM -0400, James Simmons wrote: > The path for lustre_errno.h was not updated to the new path > for errno.c. Also the header lustre_net.h uses code found in > lustre_errno.h but doesn't include the header directly. It > is easy to forget to add the header lustre_errno.h before > including lustre_net.h so it is just easier to include > lustre_errno.h in lustre_net.h. This should resolve the > build issues seen on the ia64 platform. > > Signed-off-by: James Simmons <jsimmons@infradead.org> > --- > drivers/staging/lustre/lustre/include/lustre_net.h | 1 + > drivers/staging/lustre/lustre/ptlrpc/errno.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) Merge this into the correct patch and send both patch series again please. thanks, greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web