hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: uapi: remove need for libcfs.h from lustre_cfg.h 

Several libcfs.h macros are present in lustre_cfg.h, but libcfs.h
is not available so lets replace those macros with real code.
The header libcfs.h also provides errno.h so with libcfs.h gone
include errno.h directly.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/26966
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2017-08-19 22:26:20 -04:00 committed by Greg Kroah-Hartman
parent f55b74110f
commit 955073c4fe
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h
View File

@ -33,6 +33,8 @@
#ifndef _LUSTRE_CFG_H
#define _LUSTRE_CFG_H
#include <linux/errno.h>
#include <linux/kernel.h>
#include "../../../../lustre/include/lustre/lustre_user.h"
/** \defgroup cfg cfg
@ -48,7 +50,7 @@
#define LUSTRE_CFG_MAX_BUFCOUNT 8
#define LCFG_HDR_SIZE(count) \
cfs_size_round(offsetof(struct lustre_cfg, lcfg_buflens[(count)]))
__ALIGN_KERNEL(offsetof(struct lustre_cfg, lcfg_buflens[(count)]), 8)
/** If the LCFG_REQUIRED bit is set in a configuration command,
* then the client is required to understand this parameter
@ -165,7 +167,7 @@ static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, __u32 index)
offset = LCFG_HDR_SIZE(lcfg->lcfg_bufcount);
for (i = 0; i < index; i++)
offset += cfs_size_round(lcfg->lcfg_buflens[i]);
offset += __ALIGN_KERNEL(lcfg->lcfg_buflens[i], 8);
return (char *)lcfg + offset;
}
@ -188,9 +190,9 @@ static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens)
len = LCFG_HDR_SIZE(bufcount);
for (i = 0; i < bufcount; i++)
len += cfs_size_round(buflens[i]);
len += __ALIGN_KERNEL(buflens[i], 8);
return cfs_size_round(len);
return __ALIGN_KERNEL(len, 8);
}
static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd,
@ -206,7 +208,10 @@ static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd,
ptr = (char *)lcfg + LCFG_HDR_SIZE(lcfg->lcfg_bufcount);
for (i = 0; i < lcfg->lcfg_bufcount; i++) {
lcfg->lcfg_buflens[i] = bufs->lcfg_buflen[i];
LOGL((char *)bufs->lcfg_buf[i], bufs->lcfg_buflen[i], ptr);
if (bufs->lcfg_buf[i]) {
memcpy(ptr, bufs->lcfg_buf[i], bufs->lcfg_buflen[i]);
ptr += __ALIGN_KERNEL(bufs->lcfg_buflen[i], 8);
}
}
}