summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>2004-07-12 21:00:06 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-12 21:00:06 -0700
commit7b091e0254ff3c5b44b2e5af2142d094414af45e (patch)
tree634d35f93b9394967fa04dfbd558bf42b5acf75d /include
parent0c4fb9bf2efb7fe20891946240912725fb117fee (diff)
[PATCH] sparse: switching afs to kvec
- afs and rxrpc switched to kvec; definition of kvec moved to uio.h (duh). - afs/mntpt.c got missing cast added. at that point afs is sparse-clean and rxrpc has only one remaining warning (setsockopt from local variable, protected by set_fs()).
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/mtd.h5
-rw-r--r--include/linux/uio.h9
-rw-r--r--include/rxrpc/call.h2
-rw-r--r--include/rxrpc/message.h4
4 files changed, 12 insertions, 8 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 7718658e8e1b..2f0e43db0307 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -12,11 +12,6 @@
#include <linux/module.h>
#include <linux/uio.h>
-struct kvec {
- void *iov_base; /* and that should *never* hold a userland pointer */
- size_t iov_len;
-};
-
#endif /* __KERNEL__ */
struct erase_info_user {
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 8bc074189f96..9af8bbcd8963 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -23,6 +23,15 @@ struct iovec
__kernel_size_t iov_len; /* Must be size_t (1003.1g) */
};
+#ifdef __KERNEL__
+
+struct kvec {
+ void *iov_base; /* and that should *never* hold a userland pointer */
+ size_t iov_len;
+};
+
+#endif
+
/*
* UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
*/
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h
index 9f0ce416a13e..2620d1921ec6 100644
--- a/include/rxrpc/call.h
+++ b/include/rxrpc/call.h
@@ -204,7 +204,7 @@ extern int rxrpc_call_read_data(struct rxrpc_call *call, void *buffer, size_t si
extern int rxrpc_call_write_data(struct rxrpc_call *call,
size_t sioc,
- struct iovec siov[],
+ struct kvec *siov,
uint8_t rxhdr_flags,
int alloc_flags,
int dup_data,
diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h
index d5755c6db3a8..3a59df6870b2 100644
--- a/include/rxrpc/message.h
+++ b/include/rxrpc/message.h
@@ -44,7 +44,7 @@ struct rxrpc_message
int dcount; /* data part count */
size_t dsize; /* data size */
#define RXRPC_MSG_MAX_IOCS 8
- struct iovec data[RXRPC_MSG_MAX_IOCS]; /* message data */
+ struct kvec data[RXRPC_MSG_MAX_IOCS]; /* message data */
unsigned long dfree; /* bit mask indicating kfree(data[x]) if T */
};
@@ -62,7 +62,7 @@ extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
struct rxrpc_call *call,
uint8_t type,
int count,
- struct iovec diov[],
+ struct kvec *diov,
int alloc_flags,
struct rxrpc_message **_msg);