Commit 01b0c5cf authored by Thiago Farina's avatar Thiago Farina Committed by David S. Miller

net/9p/protocol.c: Remove duplicated macros.

Use the macros already provided by kernel.h file.
Signed-off-by: default avatarThiago Farina <tfransosi@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa942104
...@@ -27,31 +27,16 @@ ...@@ -27,31 +27,16 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/stddef.h>
#include <linux/types.h> #include <linux/types.h>
#include <net/9p/9p.h> #include <net/9p/9p.h>
#include <net/9p/client.h> #include <net/9p/client.h>
#include "protocol.h" #include "protocol.h"
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef offset_of
#define offset_of(type, memb) \
((unsigned long)(&((type *)0)->memb))
#endif
#ifndef container_of
#define container_of(obj, type, memb) \
((type *)(((char *)obj) - offset_of(type, memb)))
#endif
static int static int
p9pdu_writef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...); p9pdu_writef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...);
...@@ -104,7 +89,7 @@ EXPORT_SYMBOL(p9stat_free); ...@@ -104,7 +89,7 @@ EXPORT_SYMBOL(p9stat_free);
static size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size) static size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size)
{ {
size_t len = MIN(pdu->size - pdu->offset, size); size_t len = min(pdu->size - pdu->offset, size);
memcpy(data, &pdu->sdata[pdu->offset], len); memcpy(data, &pdu->sdata[pdu->offset], len);
pdu->offset += len; pdu->offset += len;
return size - len; return size - len;
...@@ -112,7 +97,7 @@ static size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size) ...@@ -112,7 +97,7 @@ static size_t pdu_read(struct p9_fcall *pdu, void *data, size_t size)
static size_t pdu_write(struct p9_fcall *pdu, const void *data, size_t size) static size_t pdu_write(struct p9_fcall *pdu, const void *data, size_t size)
{ {
size_t len = MIN(pdu->capacity - pdu->size, size); size_t len = min(pdu->capacity - pdu->size, size);
memcpy(&pdu->sdata[pdu->size], data, len); memcpy(&pdu->sdata[pdu->size], data, len);
pdu->size += len; pdu->size += len;
return size - len; return size - len;
...@@ -121,7 +106,7 @@ static size_t pdu_write(struct p9_fcall *pdu, const void *data, size_t size) ...@@ -121,7 +106,7 @@ static size_t pdu_write(struct p9_fcall *pdu, const void *data, size_t size)
static size_t static size_t
pdu_write_u(struct p9_fcall *pdu, const char __user *udata, size_t size) pdu_write_u(struct p9_fcall *pdu, const char __user *udata, size_t size)
{ {
size_t len = MIN(pdu->capacity - pdu->size, size); size_t len = min(pdu->capacity - pdu->size, size);
if (copy_from_user(&pdu->sdata[pdu->size], udata, len)) if (copy_from_user(&pdu->sdata[pdu->size], udata, len))
len = 0; len = 0;
...@@ -201,7 +186,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt, ...@@ -201,7 +186,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
if (errcode) if (errcode)
break; break;
size = MAX(len, 0); size = max_t(int16_t, len, 0);
*sptr = kmalloc(size + 1, GFP_KERNEL); *sptr = kmalloc(size + 1, GFP_KERNEL);
if (*sptr == NULL) { if (*sptr == NULL) {
...@@ -256,7 +241,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt, ...@@ -256,7 +241,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
p9pdu_readf(pdu, proto_version, "d", count); p9pdu_readf(pdu, proto_version, "d", count);
if (!errcode) { if (!errcode) {
*count = *count =
MIN(*count, min_t(int32_t, *count,
pdu->size - pdu->offset); pdu->size - pdu->offset);
*data = &pdu->sdata[pdu->offset]; *data = &pdu->sdata[pdu->offset];
} }
...@@ -421,7 +406,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...@@ -421,7 +406,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt,
const char *sptr = va_arg(ap, const char *); const char *sptr = va_arg(ap, const char *);
int16_t len = 0; int16_t len = 0;
if (sptr) if (sptr)
len = MIN(strlen(sptr), USHRT_MAX); len = min_t(int16_t, strlen(sptr), USHRT_MAX);
errcode = p9pdu_writef(pdu, proto_version, errcode = p9pdu_writef(pdu, proto_version,
"w", len); "w", len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment