leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: uapi: use __ALIGN_KERNEL for lustre_ioctl.h

Browse Source 
Replace cfs_size_round() standard __ALIGN_KERNEL macro. This
removes the dependency of libcfs.h which is a kernel only
header.

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/24568
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
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:07 -04:00 committed by Greg Kroah-Hartman
parent 325da9674b
commit 30bfc47885
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h
View File

@ -28,8 +28,8 @@
#ifndef LUSTRE_IOCTL_H_
#define LUSTRE_IOCTL_H_
#include <linux/kernel.h>
#include <linux/types.h>
#include "../../../linux/libcfs/libcfs.h"
#include "../../../../lustre/include/lustre/lustre_idl.h"
#ifdef __KERNEL__
@ -121,12 +121,12 @@ struct obd_ioctl_hdr {
static inline __u32 obd_ioctl_packlen(struct obd_ioctl_data *data)
{
__u32 len = cfs_size_round(sizeof(*data));
__u32 len = __ALIGN_KERNEL(sizeof(*data), 8);
len += cfs_size_round(data->ioc_inllen1);
len += cfs_size_round(data->ioc_inllen2);
len += cfs_size_round(data->ioc_inllen3);
len += cfs_size_round(data->ioc_inllen4);
len += __ALIGN_KERNEL(data->ioc_inllen1, 8);
len += __ALIGN_KERNEL(data->ioc_inllen2, 8);
len += __ALIGN_KERNEL(data->ioc_inllen3, 8);
len += __ALIGN_KERNEL(data->ioc_inllen4, 8);
return len;
}