rbd: define dup_token()
Define a new function dup_token(), to be used during argument parsing for making dynamically-allocated copies of tokens being parsed. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
parent
f8c36c58ac
commit
ea3352f4aa
|
@ -2280,6 +2280,42 @@ static inline size_t copy_token(const char **buf,
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Finds the next token in *buf, dynamically allocates a buffer big
|
||||||
|
* enough to hold a copy of it, and copies the token into the new
|
||||||
|
* buffer. The copy is guaranteed to be terminated with '\0'. Note
|
||||||
|
* that a duplicate buffer is created even for a zero-length token.
|
||||||
|
*
|
||||||
|
* Returns a pointer to the newly-allocated duplicate, or a null
|
||||||
|
* pointer if memory for the duplicate was not available. If
|
||||||
|
* the lenp argument is a non-null pointer, the length of the token
|
||||||
|
* (not including the '\0') is returned in *lenp.
|
||||||
|
*
|
||||||
|
* If successful, the *buf pointer will be updated to point beyond
|
||||||
|
* the end of the found token.
|
||||||
|
*
|
||||||
|
* Note: uses GFP_KERNEL for allocation.
|
||||||
|
*/
|
||||||
|
static inline char *dup_token(const char **buf, size_t *lenp)
|
||||||
|
{
|
||||||
|
char *dup;
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
len = next_token(buf);
|
||||||
|
dup = kmalloc(len + 1, GFP_KERNEL);
|
||||||
|
if (!dup)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
memcpy(dup, *buf, len);
|
||||||
|
*(dup + len) = '\0';
|
||||||
|
*buf += len;
|
||||||
|
|
||||||
|
if (lenp)
|
||||||
|
*lenp = len;
|
||||||
|
|
||||||
|
return dup;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This fills in the pool_name, obj, obj_len, snap_name, obj_len,
|
* This fills in the pool_name, obj, obj_len, snap_name, obj_len,
|
||||||
* rbd_dev, rbd_md_name, and name fields of the given rbd_dev, based
|
* rbd_dev, rbd_md_name, and name fields of the given rbd_dev, based
|
||||||
|
|
Loading…
Reference in New Issue