Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2675 llite: remove generic operations from llite/namei.c
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_update.h
diff --git
a/lustre/include/lustre_update.h
b/lustre/include/lustre_update.h
index
d99e141
..
e09fe3f
100644
(file)
--- a/
lustre/include/lustre_update.h
+++ b/
lustre/include/lustre_update.h
@@
-30,6
+30,7
@@
#ifndef _LUSTRE_UPDATE_H
#define _LUSTRE_UPDATE_H
#ifndef _LUSTRE_UPDATE_H
#define _LUSTRE_UPDATE_H
+#include <lustre_net.h>
#define OUT_UPDATE_INIT_BUFFER_SIZE 8192
#define OUT_UPDATE_REPLY_SIZE 8192
#define OUT_UPDATE_INIT_BUFFER_SIZE 8192
#define OUT_UPDATE_REPLY_SIZE 8192
@@
-59,7
+60,7
@@
object_update_size(const struct object_update *update)
{
const struct object_update_param *param;
unsigned long size;
{
const struct object_update_param *param;
unsigned long size;
-
int
i;
+
size_t
i;
size = offsetof(struct object_update, ou_params[0]);
for (i = 0; i < update->ou_params_count; i++) {
size = offsetof(struct object_update, ou_params[0]);
for (i = 0; i < update->ou_params_count; i++) {
@@
-71,11
+72,11
@@
object_update_size(const struct object_update *update)
}
static inline void
}
static inline void
-*object_update_param_get(const struct object_update *update,
in
t index,
-
in
t *size)
+*object_update_param_get(const struct object_update *update,
size_
t index,
+
size_
t *size)
{
const struct object_update_param *param;
{
const struct object_update_param *param;
-
int
i;
+
size_t
i;
if (index >= update->ou_params_count)
return NULL;
if (index >= update->ou_params_count)
return NULL;
@@
-97,8
+98,8
@@
static inline void
static inline unsigned long
object_update_request_size(const struct object_update_request *our)
{
static inline unsigned long
object_update_request_size(const struct object_update_request *our)
{
- unsigned long size;
-
int
i = 0;
+ unsigned long
size;
+
size_t
i = 0;
size = offsetof(struct object_update_request, ourq_updates[0]);
for (i = 0; i < our->ourq_count; i++) {
size = offsetof(struct object_update_request, ourq_updates[0]);
for (i = 0; i < our->ourq_count; i++) {
@@
-112,10
+113,10
@@
object_update_request_size(const struct object_update_request *our)
static inline struct object_update
*object_update_request_get(const struct object_update_request *our,
static inline struct object_update
*object_update_request_get(const struct object_update_request *our,
-
int index, in
t *size)
+
size_t index, size_
t *size)
{
void *ptr;
{
void *ptr;
-
int
i;
+
size_t
i;
if (index >= our->ourq_count)
return NULL;
if (index >= our->ourq_count)
return NULL;
@@
-132,7
+133,7
@@
static inline struct object_update
}
static inline void
}
static inline void
-object_update_reply_init(struct object_update_reply *reply,
in
t count)
+object_update_reply_init(struct object_update_reply *reply,
size_
t count)
{
reply->ourp_magic = UPDATE_REPLY_MAGIC;
reply->ourp_count = count;
{
reply->ourp_magic = UPDATE_REPLY_MAGIC;
reply->ourp_count = count;
@@
-140,11
+141,11
@@
object_update_reply_init(struct object_update_reply *reply, int count)
static inline struct object_update_result
*object_update_result_get(const struct object_update_reply *reply,
static inline struct object_update_result
*object_update_result_get(const struct object_update_reply *reply,
-
int index, in
t *size)
+
size_t index, size_
t *size)
{
char *ptr;
{
char *ptr;
-
in
t count = reply->ourp_count;
-
in
t i;
+
size_
t count = reply->ourp_count;
+
size_
t i;
if (index >= count)
return NULL;
if (index >= count)
return NULL;
@@
-165,7
+166,7
@@
static inline struct object_update_result
static inline void
object_update_result_insert(struct object_update_reply *reply,
static inline void
object_update_result_insert(struct object_update_reply *reply,
- void *data,
int data_len, in
t index,
+ void *data,
size_t data_len, size_
t index,
int rc)
{
struct object_update_result *update_result;
int rc)
{
struct object_update_result *update_result;
@@
-189,11
+190,11
@@
object_update_result_insert(struct object_update_reply *reply,
static inline int
object_update_result_data_get(const struct object_update_reply *reply,
static inline int
object_update_result_data_get(const struct object_update_reply *reply,
- struct lu_buf *lbuf,
in
t index)
+ struct lu_buf *lbuf,
size_
t index)
{
struct object_update_result *update_result;
{
struct object_update_result *update_result;
-
int
size = 0;
- int result;
+
size_t
size = 0;
+ int
result;
LASSERT(lbuf != NULL);
update_result = object_update_result_get(reply, index, &size);
LASSERT(lbuf != NULL);
update_result = object_update_result_get(reply, index, &size);