*
* \param[in] lov_xattr LOV user metadata xattr to copy data from
* \param[in] lov_xattr_size size the lov_xattr_size passed in
- * \param[in] flags bitwise-or'd flags to control the behavior
+ * \param[in] flags flags to control how layout is retrieved
*
* \retval valid llapi_layout pointer on success
* \retval NULL if memory allocation fails
*/
struct llapi_layout *llapi_layout_get_by_xattr(void *lov_xattr,
- ssize_t lov_xattr_size,
- uint32_t flags)
+ ssize_t lov_xattr_size,
+ enum llapi_layout_get_flags flags)
{
struct lov_user_md *lum = lov_xattr;
struct lov_comp_md_v1 *comp_v1 = NULL;
}
#if __BYTE_ORDER == __BIG_ENDIAN
- if (flags & LLAPI_LXF_COPY) {
+ if (flags & LLAPI_LAYOUT_GET_COPY) {
lum = malloc(lov_xattr_size);
if (lum == NULL) {
errno = ENOMEM;
llapi_layout_swab_lov_user_md(lum, lov_xattr_size);
- if ((flags & LLAPI_LXF_CHECK) &&
+#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 16, 53, 0)
+#define LLAPI_LXF_CHECK_OLD 0x0001
+ if (flags & LLAPI_LXF_CHECK_OLD)
+ flags = (flags & ~LLAPI_LXF_CHECK_OLD) | LLAPI_LAYOUT_GET_CHECK;
+#endif
+ if ((flags & LLAPI_LAYOUT_GET_CHECK) &&
!llapi_layout_lum_valid(lum, lov_xattr_size)) {
errno = EBADSLT;
goto out;
* \retval valid llapi_layout pointer on success
* \retval NULL if an error occurs
*/
-struct llapi_layout *llapi_layout_get_by_fd(int fd, uint32_t flags)
+struct llapi_layout *llapi_layout_get_by_fd(int fd,
+ enum llapi_layout_get_flags flags)
{
size_t lum_len;
struct lov_user_md *lum;
goto out;
layout = llapi_layout_get_by_xattr(lum, bytes_read,
- S_ISDIR(st.st_mode) ? 0 : LLAPI_LXF_CHECK);
+ S_ISDIR(st.st_mode) ? 0 : LLAPI_LAYOUT_GET_CHECK);
out:
free(lum);
return layout;
/**
* Get the striping layout for the file at \a path.
*
- * If \a flags contains LAYOUT_GET_EXPECTED, substitute
+ * If \a flags contains LLAPI_LAYOUT_GET_EXPECTED, substitute
* expected inherited attribute values for unspecified attributes. See
* llapi_layout_expected().
*
* \retval valid llapi_layout pointer on success
* \retval NULL if an error occurs
*/
-struct llapi_layout *llapi_layout_get_by_path(const char *path, uint32_t flags)
+struct llapi_layout *llapi_layout_get_by_path(const char *path,
+ enum llapi_layout_get_flags flags)
{
struct llapi_layout *layout = NULL;
int fd;
int tmp;
- if (flags & LAYOUT_GET_EXPECTED)
+ if (flags & LLAPI_LAYOUT_GET_EXPECTED)
return llapi_layout_expected(path);
fd = open(path, O_RDONLY);
*/
struct llapi_layout *llapi_layout_get_by_fid(const char *lustre_dir,
const struct lu_fid *fid,
- uint32_t flags)
+ enum llapi_layout_get_flags flags)
{
int fd;
int tmp;
* the old API uses 0 and -1.
*/
-static bool llapi_layout_stripe_count_is_valid(int64_t stripe_count)
+bool llapi_layout_stripe_count_is_valid(int64_t stripe_count)
{
return stripe_count == LLAPI_LAYOUT_DEFAULT ||
stripe_count == LLAPI_LAYOUT_WIDE ||
* \retval -1 if arguments are invalid or pool name is too long
*/
int llapi_layout_pool_name_set(struct llapi_layout *layout,
- const char *pool_name)
+ char *pool_name)
{
struct llapi_layout_comp *comp;
- char *ptr;
comp = __llapi_layout_cur_comp(layout);
if (comp == NULL)
return -1;
- if (pool_name == NULL) {
- errno = EINVAL;
- return -1;
- }
-
- /* Strip off any 'fsname.' portion. */
- ptr = strchr(pool_name, '.');
- if (ptr != NULL)
- pool_name = ptr + 1;
-
- if (strlen(pool_name) > LOV_MAXPOOLNAME) {
+ if (!llapi_pool_name_is_valid(&pool_name, NULL)) {
errno = EINVAL;
return -1;
}
strncpy(comp->llc_pool_name, pool_name, sizeof(comp->llc_pool_name));
-
return 0;
}
}
if (layout) {
- rc = llapi_layout_sanity((struct llapi_layout *)layout, false,
+ rc = llapi_layout_sanity((struct llapi_layout *)layout,
+ path, false,
!!(layout->llot_mirror_count > 1));
if (rc) {
llapi_layout_sanity_perror(rc);
return "0";
}
-const __u16 llapi_layout_string_flags(char *string)
+__u16 llapi_layout_string_flags(char *string)
{
if (strncmp(string, "ro", strlen(string)) == 0)
return LCM_FL_RDONLY;
goto out;
}
- rc = llapi_layout_sanity(existing_layout, false, false);
+ rc = llapi_layout_sanity(existing_layout, path, false, false);
if (rc) {
tmp_errno = errno;
llapi_layout_sanity_perror(rc);
goto out;
}
- rc = llapi_layout_sanity(existing_layout, false, false);
+ rc = llapi_layout_sanity(existing_layout, path, false, false);
if (rc) {
tmp_errno = errno;
llapi_layout_sanity_perror(rc);
goto out;
}
- rc = llapi_layout_sanity(existing_layout, false, false);
+ rc = llapi_layout_sanity(existing_layout, path, false, false);
if (rc) {
tmp_errno = errno;
llapi_layout_sanity_perror(rc);
LSE_START_GT_END,
LSE_ALIGN_END,
LSE_ALIGN_EXT,
+ LSE_UNKNOWN_OST,
LSE_LAST,
};
"The component end must be aligned by the stripe size",
[LSE_ALIGN_EXT] =
"The extension size must be aligned by the stripe size",
+ [LSE_UNKNOWN_OST] =
+ "An unknown OST idx is specified",
};
struct llapi_layout_sanity_args {
+ char lsa_fsname[MAX_OBD_NAME + 1];
bool lsa_incomplete;
bool lsa_flr;
bool lsa_ondisk;
#define LCME_USER_COMP_FLAGS (LCME_FL_PREF_RW | LCME_FL_NOSYNC | \
LCME_FL_EXTENSION)
+/**
+ * When modified, adjust llapi_stripe_param_verify() if needed as well.
+ */
static int llapi_layout_sanity_cb(struct llapi_layout *layout,
void *arg)
{
} else if (!(comp->llc_flags & LCME_FL_EXTENSION) &&
(comp->llc_stripe_size != LLAPI_LAYOUT_DEFAULT)) {
if (comp->llc_extent.e_end != LUSTRE_EOF &&
+ comp->llc_extent.e_end !=
+ comp->llc_extent.e_start &&
comp->llc_extent.e_end % comp->llc_stripe_size) {
args->lsa_rc = LSE_ALIGN_END;
goto out_err;
goto out_err;
}
+ if (args->lsa_fsname[0] != '\0') {
+ int i, rc = 0;
+
+ if (comp->llc_pattern & LLAPI_LAYOUT_SPECIFIC) {
+ assert(comp->llc_stripe_count <=
+ comp->llc_objects_count);
+
+ for (i = 0; i < comp->llc_stripe_count && rc == 0; i++){
+ if (comp->llc_objects[i].l_ost_idx ==
+ LLAPI_LAYOUT_IDX_MAX) {
+ args->lsa_rc = -1;
+ goto out_err;
+ }
+ rc = llapi_layout_search_ost(
+ comp->llc_objects[i].l_ost_idx,
+ comp->llc_pool_name, args->lsa_fsname);
+ }
+ } else if (comp->llc_stripe_offset != LLAPI_LAYOUT_DEFAULT) {
+ rc = llapi_layout_search_ost(
+ comp->llc_stripe_offset,
+ comp->llc_pool_name, args->lsa_fsname);
+ }
+ if (rc) {
+ args->lsa_rc = LSE_UNKNOWN_OST;
+ goto out_err;
+ }
+ }
+
return LLAPI_LAYOUT_ITER_CONT;
out_err:
* components"?
*
* \param[in] layout component layout list.
+ * \param[in] fname file the layout to be checked for
* \param[in] incomplete if layout is complete or not - some checks can
* only be done on complete layouts.
* \param[in] flr set when this is called from FLR mirror create
* \retval 0, success, positive: various errors, see
* llapi_layout_sanity_perror, -1, failure
*/
-int llapi_layout_sanity(struct llapi_layout *layout, bool incomplete, bool flr)
+int llapi_layout_sanity(struct llapi_layout *layout,
+ const char *fname,
+ bool incomplete,
+ bool flr)
{
- struct llapi_layout_sanity_args args;
+ struct llapi_layout_sanity_args args = { { 0 } };
struct llapi_layout_comp *curr;
int rc = 0;
if (!curr)
return 0;
+ /* Make sure we are on a Lustre file system */
+ if (fname) {
+ rc = llapi_search_fsname(fname, args.lsa_fsname);
+ if (rc) {
+ llapi_error(LLAPI_MSG_ERROR, rc,
+ "'%s' is not on a Lustre filesystem",
+ fname);
+ return rc;
+ }
+ }
+
/* Set up args */
args.lsa_rc = 0;
args.lsa_flr = flr;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff