* GPL HEADER END
*/
/*
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2015, Intel Corporation.
*/
/*
* lustre/target/out_lib.c
#define DEBUG_SUBSYSTEM S_CLASS
#include <lu_target.h>
-#include <md_object.h>
+#include <lustre_obdo.h>
#include <lustre_update.h>
+#include <md_object.h>
#include <obd.h>
#include <obd_class.h>
-#include "tgt_internal.h"
-#define OUT_UPDATE_BUFFER_SIZE_ADD 4096
-#define OUT_UPDATE_BUFFER_SIZE_MAX (256 * 4096) /* 1MB update size now */
+#include "tgt_internal.h"
const char *update_op_str(__u16 opc)
{
[OUT_XATTR_DEL] = "xattr_del",
[OUT_PUNCH] = "punch",
[OUT_READ] = "read",
+ [OUT_NOOP] = "noop",
};
if (opc < ARRAY_SIZE(opc_str) && opc_str[opc] != NULL)
*
* \params[in] env execution environment
* \params[in] update object update to be filled
- * \params[in] max_update_size maximum object update size, if the current
- * update length equals or exceeds the size, it
- * will return -E2BIG.
+ * \params[in,out] max_update_size maximum object update size, if the
+ * current update length equals or
+ * exceeds the size, it will return -E2BIG.
* \params[in] update_op update type
* \params[in] fid object FID of the update
- * \params[in] params_count the count of the update parameters
- * \params[in] params_sizes the length of each parameters
+ * \params[in] param_count the count of the update parameters
+ * \params[in] param_sizes the length of each parameters
*
* \retval 0 if packing succeeds.
* \retval -E2BIG if packing exceeds the maximum length.
*/
int out_update_header_pack(const struct lu_env *env,
- struct object_update *update, size_t max_update_size,
- enum update_type update_op, const struct lu_fid *fid,
- unsigned int param_count, __u16 *params_sizes)
+ struct object_update *update,
+ size_t *max_update_size,
+ enum update_type update_op,
+ const struct lu_fid *fid,
+ unsigned int param_count,
+ __u16 *param_sizes,
+ __u32 reply_size)
{
struct object_update_param *param;
unsigned int i;
size_t update_size;
+ if (((reply_size + 7) >> 3) >= 1ULL << 16)
+ return -EINVAL;
+
/* Check whether the packing exceeding the maxima update length */
update_size = sizeof(*update);
for (i = 0; i < param_count; i++)
- update_size += cfs_size_round(sizeof(*param) + params_sizes[i]);
+ update_size += cfs_size_round(sizeof(*param) + param_sizes[i]);
- if (unlikely(update_size >= max_update_size))
+ if (unlikely(update_size >= *max_update_size)) {
+ *max_update_size = update_size;
return -E2BIG;
+ }
update->ou_fid = *fid;
update->ou_type = update_op;
update->ou_params_count = param_count;
+ update->ou_result_size = reply_size;
param = &update->ou_params[0];
for (i = 0; i < param_count; i++) {
- param->oup_len = params_sizes[i];
+ param->oup_len = param_sizes[i];
param = (struct object_update_param *)((char *)param +
object_update_param_size(param));
}
* \retval negative errno if updates packing fails
**/
int out_update_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, enum update_type op,
+ size_t *max_update_size, enum update_type op,
const struct lu_fid *fid, unsigned int param_count,
- __u16 *param_sizes, const void **param_bufs)
+ __u16 *param_sizes, const void **param_bufs,
+ __u32 reply_size)
{
struct object_update_param *param;
unsigned int i;
ENTRY;
rc = out_update_header_pack(env, update, max_update_size, op, fid,
- param_count, param_sizes);
+ param_count, param_sizes, reply_size);
if (rc != 0)
RETURN(rc);
* \retval negative errno if insertion fails.
*/
int out_create_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct lu_attr *attr, struct dt_allocation_hint *hint,
struct dt_object_format *dof)
{
}
rc = out_update_header_pack(env, update, max_update_size, OUT_CREATE,
- fid, buf_count, sizes);
+ fid, buf_count, sizes, 0);
if (rc != 0)
RETURN(rc);
obdo = object_update_param_get(update, 0, NULL);
- LASSERT(obdo != NULL);
+ if (IS_ERR(obdo))
+ RETURN(PTR_ERR(obdo));
+
obdo->o_valid = 0;
obdo_from_la(obdo, attr, attr->la_valid);
lustre_set_wire_obdo(NULL, obdo, obdo);
struct lu_fid *tmp;
tmp = object_update_param_get(update, 1, NULL);
- LASSERT(tmp != NULL);
+ if (IS_ERR(tmp))
+ RETURN(PTR_ERR(tmp));
+
fid_cpu_to_le(tmp, parent_fid);
}
EXPORT_SYMBOL(out_create_pack);
int out_ref_del_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid)
+ size_t *max_update_size, const struct lu_fid *fid)
{
return out_update_pack(env, update, max_update_size, OUT_REF_DEL, fid,
- 0, NULL, NULL);
+ 0, NULL, NULL, 0);
}
EXPORT_SYMBOL(out_ref_del_pack);
int out_ref_add_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid)
+ size_t *max_update_size, const struct lu_fid *fid)
{
return out_update_pack(env, update, max_update_size, OUT_REF_ADD, fid,
- 0, NULL, NULL);
+ 0, NULL, NULL, 0);
}
EXPORT_SYMBOL(out_ref_add_pack);
int out_attr_set_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct lu_attr *attr)
{
struct obdo *obdo;
ENTRY;
rc = out_update_header_pack(env, update, max_update_size,
- OUT_ATTR_SET, fid, 1, &size);
+ OUT_ATTR_SET, fid, 1, &size, 0);
if (rc != 0)
RETURN(rc);
obdo = object_update_param_get(update, 0, NULL);
- LASSERT(obdo != NULL);
+ if (IS_ERR(obdo))
+ RETURN(PTR_ERR(obdo));
+
obdo->o_valid = 0;
obdo_from_la(obdo, attr, attr->la_valid);
lustre_set_wire_obdo(NULL, obdo, obdo);
EXPORT_SYMBOL(out_attr_set_pack);
int out_xattr_set_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct lu_buf *buf, const char *name, __u32 flag)
{
__u16 sizes[3] = {strlen(name) + 1, buf->lb_len, sizeof(flag)};
(char *)&flag};
return out_update_pack(env, update, max_update_size, OUT_XATTR_SET,
- fid, ARRAY_SIZE(sizes), sizes, bufs);
+ fid, ARRAY_SIZE(sizes), sizes, bufs, 0);
}
EXPORT_SYMBOL(out_xattr_set_pack);
int out_xattr_del_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const char *name)
{
__u16 size = strlen(name) + 1;
return out_update_pack(env, update, max_update_size, OUT_XATTR_DEL,
- fid, 1, &size, (const void **)&name);
+ fid, 1, &size, (const void **)&name, 0);
}
EXPORT_SYMBOL(out_xattr_del_pack);
-
int out_index_insert_pack(const struct lu_env *env,
struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct dt_rec *rec, const struct dt_key *key)
{
struct dt_insert_rec *rec1 = (struct dt_insert_rec *)rec;
fid_cpu_to_le(&rec_fid, rec1->rec_fid);
return out_update_pack(env, update, max_update_size, OUT_INDEX_INSERT,
- fid, ARRAY_SIZE(sizes), sizes, bufs);
+ fid, ARRAY_SIZE(sizes), sizes, bufs, 0);
}
EXPORT_SYMBOL(out_index_insert_pack);
int out_index_delete_pack(const struct lu_env *env,
struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct dt_key *key)
{
__u16 size = strlen((char *)key) + 1;
const void *buf = key;
return out_update_pack(env, update, max_update_size, OUT_INDEX_DELETE,
- fid, 1, &size, &buf);
+ fid, 1, &size, &buf, 0);
}
EXPORT_SYMBOL(out_index_delete_pack);
int out_object_destroy_pack(const struct lu_env *env,
struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid)
+ size_t *max_update_size, const struct lu_fid *fid)
{
return out_update_pack(env, update, max_update_size, OUT_DESTROY, fid,
- 0, NULL, NULL);
+ 0, NULL, NULL, 0);
}
EXPORT_SYMBOL(out_object_destroy_pack);
int out_write_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
const struct lu_buf *buf, __u64 pos)
{
__u16 sizes[2] = {buf->lb_len, sizeof(pos)};
pos = cpu_to_le64(pos);
rc = out_update_pack(env, update, max_update_size, OUT_WRITE, fid,
- ARRAY_SIZE(sizes), sizes, bufs);
+ ARRAY_SIZE(sizes), sizes, bufs, 0);
return rc;
}
EXPORT_SYMBOL(out_write_pack);
**/
int out_index_lookup_pack(const struct lu_env *env,
struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
struct dt_rec *rec, const struct dt_key *key)
{
const void *name = key;
__u16 size = strlen((char *)name) + 1;
+ /* XXX: this shouldn't be hardcoded */
return out_update_pack(env, update, max_update_size, OUT_INDEX_LOOKUP,
- fid, 1, &size, &name);
+ fid, 1, &size, &name, 256);
}
EXPORT_SYMBOL(out_index_lookup_pack);
int out_attr_get_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid)
+ size_t *max_update_size, const struct lu_fid *fid)
{
return out_update_pack(env, update, max_update_size, OUT_ATTR_GET,
- fid, 0, NULL, NULL);
+ fid, 0, NULL, NULL, sizeof(struct obdo));
}
EXPORT_SYMBOL(out_attr_get_pack);
int out_xattr_get_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_size, const struct lu_fid *fid,
- const char *name)
+ size_t *max_update_size, const struct lu_fid *fid,
+ const char *name, const int bufsize)
{
__u16 size;
size = strlen(name) + 1;
return out_update_pack(env, update, max_update_size, OUT_XATTR_GET,
- fid, 1, &size, (const void **)&name);
+ fid, 1, &size, (const void **)&name, bufsize);
}
EXPORT_SYMBOL(out_xattr_get_pack);
int out_read_pack(const struct lu_env *env, struct object_update *update,
- size_t max_update_length, const struct lu_fid *fid,
+ size_t *max_update_size, const struct lu_fid *fid,
size_t size, loff_t pos)
{
__u16 sizes[2] = {sizeof(size), sizeof(pos)};
const void *bufs[2] = {&size, &pos};
+ LASSERT(size > 0);
size = cpu_to_le64(size);
pos = cpu_to_le64(pos);
- return out_update_pack(env, update, max_update_length, OUT_READ, fid,
- ARRAY_SIZE(sizes), sizes, bufs);
+ return out_update_pack(env, update, max_update_size, OUT_READ, fid,
+ ARRAY_SIZE(sizes), sizes, bufs, size);
}
EXPORT_SYMBOL(out_read_pack);
PFID(lu_object_fid(&dt_obj->do_lu)), arg->u.write.pos,
arg->u.write.buf.lb_buf, (unsigned long)arg->u.write.buf.lb_len);
- dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
- rc = dt_record_write(env, dt_obj, &arg->u.write.buf,
- &arg->u.write.pos, th);
- dt_write_unlock(env, dt_obj);
+ if (OBD_FAIL_CHECK(OBD_FAIL_OUT_ENOSPC)) {
+ rc = -ENOSPC;
+ } else {
+ dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
+ rc = dt_record_write(env, dt_obj, &arg->u.write.buf,
+ &arg->u.write.pos, th);
+ dt_write_unlock(env, dt_obj);
- if (rc == 0)
- rc = arg->u.write.buf.lb_len;
+ if (rc == 0)
+ rc = arg->u.write.buf.lb_len;
+ }
if (arg->reply != NULL)
object_update_result_insert(arg->reply, NULL, 0, arg->index,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff