*/
int (*do_xattr_list)(const struct lu_env *env,
struct dt_object *dt,
- struct lu_buf *buf,
+ const struct lu_buf *buf,
struct lustre_capa *capa);
/**
return dt->do_ops->do_xattr_get(env, dt, buf, name, capa);
}
-static inline int dt_xattr_list(const struct lu_env *env,
- struct dt_object *dt, struct lu_buf *buf,
- struct lustre_capa *capa)
+static inline int dt_xattr_list(const struct lu_env *env, struct dt_object *dt,
+ const struct lu_buf *buf,
+ struct lustre_capa *capa)
{
LASSERT(dt);
LASSERT(dt->do_ops);
* for details.
*/
static int lod_xattr_list(const struct lu_env *env,
- struct dt_object *dt, struct lu_buf *buf,
+ struct dt_object *dt, const struct lu_buf *buf,
struct lustre_capa *capa)
{
return dt_xattr_list(env, dt_object_child(dt), buf, capa);
* Concurrency: @dt is read locked.
*/
static int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *buf, struct lustre_capa *capa)
+ const struct lu_buf *buf, struct lustre_capa *capa)
{
struct osd_object *obj = osd_dt_obj(dt);
struct inode *inode = obj->oo_inode;
const char *name, struct thandle *handle,
struct lustre_capa *capa);
int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *lb, struct lustre_capa *capa);
+ const struct lu_buf *lb, struct lustre_capa *capa);
void __osd_xattr_declare_set(const struct lu_env *env, struct osd_object *obj,
int vallen, const char *name, struct osd_thandle *oh);
int __osd_sa_xattr_set(const struct lu_env *env, struct osd_object *obj,
static int
osd_sa_xattr_list(const struct lu_env *env, struct osd_object *obj,
- struct lu_buf *lb)
+ const struct lu_buf *lb)
{
nvpair_t *nvp = NULL;
- int len, counted = 0, remain = lb->lb_len;
+ int len, counted = 0;
int rc = 0;
if (obj->oo_sa_xattr == NULL) {
strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0))
continue;
- len = strlen(nvpair_name(nvp));
+ len = strlen(name);
if (lb->lb_buf != NULL) {
- if (len + 1 > remain)
+ if (counted + len + 1 > lb->lb_len)
return -ERANGE;
- memcpy(lb->lb_buf, name, len);
- lb->lb_buf += len;
- *((char *)lb->lb_buf) = '\0';
- lb->lb_buf++;
- remain -= len + 1;
+ memcpy(lb->lb_buf + counted, name, len + 1);
}
counted += len + 1;
}
}
int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *lb, struct lustre_capa *capa)
+ const struct lu_buf *lb, struct lustre_capa *capa)
{
struct osd_object *obj = osd_dt_obj(dt);
struct osd_device *osd = osd_obj2dev(obj);
zap_attribute_t *za = &osd_oti_get(env)->oti_za;
zap_cursor_t *zc;
- int rc, counted = 0, remain = lb->lb_len;
+ int rc, counted;
ENTRY;
LASSERT(obj->oo_db != NULL);
rc = osd_sa_xattr_list(env, obj, lb);
if (rc < 0)
GOTO(out, rc);
+
counted = rc;
- remain -= counted;
/* continue with dnode xattr if any */
if (obj->oo_xattr == ZFS_NO_OBJECT)
rc = strlen(za->za_name);
if (lb->lb_buf != NULL) {
- if (rc + 1 > remain)
+ if (counted + rc + 1 > lb->lb_len)
RETURN(-ERANGE);
- memcpy(lb->lb_buf, za->za_name, rc);
- lb->lb_buf += rc;
- *((char *)lb->lb_buf) = '\0';
- lb->lb_buf++;
- remain -= rc + 1;
+ memcpy(lb->lb_buf + counted, za->za_name, rc + 1);
}
counted += rc + 1;