Commit 30bfc478 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarJames 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: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarBen Evans <bevans@cray.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 325da967

drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h

+6 −6
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE