}
/*
- * The client will do an ioctl to find MAX_ALIGNED_DEV_REQ_UPSIZE, then
+ * The client will do an ioctl to find MAX_DEV_REQ_UPSIZE, then
* always read with that size buffer.
*/
- if (count != MAX_ALIGNED_DEV_REQ_UPSIZE) {
+ if (count != MAX_DEV_REQ_UPSIZE) {
gossip_err("orangefs: client-core tried to read wrong size\n");
return -EINVAL;
}
goto error;
/* The client only asks to read one size buffer. */
- return MAX_ALIGNED_DEV_REQ_UPSIZE;
+ return MAX_DEV_REQ_UPSIZE;
error:
/*
* We were unable to copy the op data to the client. Put the op back in
void *buffer = NULL;
void *ptr = NULL;
unsigned long i = 0;
- int num_remaining = MAX_ALIGNED_DEV_REQ_DOWNSIZE;
+ int num_remaining = MAX_DEV_REQ_DOWNSIZE;
int ret = 0;
/* num elements in iovec without trailer */
int notrailer_count = 4;
static long dispatch_ioctl_command(unsigned int command, unsigned long arg)
{
static __s32 magic = ORANGEFS_DEVREQ_MAGIC;
- static __s32 max_up_size = MAX_ALIGNED_DEV_REQ_UPSIZE;
- static __s32 max_down_size = MAX_ALIGNED_DEV_REQ_DOWNSIZE;
+ static __s32 max_up_size = MAX_DEV_REQ_UPSIZE;
+ static __s32 max_down_size = MAX_DEV_REQ_DOWNSIZE;
struct ORANGEFS_dev_map_desc user_desc;
int ret = 0;
struct dev_mask_info_s mask_info = { 0 };
int dev_req_cache_initialize(void)
{
dev_req_cache = kmem_cache_create("orangefs_devreqcache",
- MAX_ALIGNED_DEV_REQ_DOWNSIZE,
+ MAX_DEV_REQ_DOWNSIZE,
0,
ORANGEFS_CACHE_CREATE_FLAGS,
NULL);
if (buffer == NULL)
gossip_err("Failed to allocate from dev_req_cache\n");
else
- memset(buffer, 0, sizeof(MAX_ALIGNED_DEV_REQ_DOWNSIZE));
+ memset(buffer, 0, sizeof(MAX_DEV_REQ_DOWNSIZE));
return buffer;
}
#define MAX_DEV_REQ_DOWNSIZE (2*sizeof(__s32) + \
sizeof(__u64) + sizeof(struct orangefs_downcall_s))
-#define BITS_PER_LONG_DIV_8 (BITS_PER_LONG >> 3)
-
/* borrowed from irda.h */
#ifndef MSECS_TO_JIFFIES
#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)
#endif
-#define MAX_ALIGNED_DEV_REQ_UPSIZE \
- (MAX_DEV_REQ_UPSIZE + \
- ((((MAX_DEV_REQ_UPSIZE / \
- (BITS_PER_LONG_DIV_8)) * \
- (BITS_PER_LONG_DIV_8)) + \
- (BITS_PER_LONG_DIV_8)) - \
- MAX_DEV_REQ_UPSIZE))
-
-#define MAX_ALIGNED_DEV_REQ_DOWNSIZE \
- (MAX_DEV_REQ_DOWNSIZE + \
- ((((MAX_DEV_REQ_DOWNSIZE / \
- (BITS_PER_LONG_DIV_8)) * \
- (BITS_PER_LONG_DIV_8)) + \
- (BITS_PER_LONG_DIV_8)) - \
- MAX_DEV_REQ_DOWNSIZE))
-
/*
* valid orangefs kernel operation states
*