[LU-6491] Confusing results for too long fsname

• Status: Resolved
• Project: Lustre
• Fix Version/s: Lustre 2.8.0
• Type: Bug
• Priority: Trivial
• Reporter: Wang Shilong (Inactive)
• Assignee: Emoly Liu
• Resolution: Fixed
• Epic/Theme: patch
• Severity: 3

Description

If users passed a fsname longer than 9 bytes, caller
will handle it as ENOMEM which output following results:

error: conf_param: Cannot allocate memory

which is really unfriendly for common users.

Comments

[Wang Shilong (Inactive)]

I missed to migrate my google account for gerrit, but i think here should fix it.
diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index d804de4..2f36696 100644
— a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -334,12 +334,12 @@ static struct fs_db *mgs_new_fsdb(const struct lu_env *env,

if (strlen(fsname) >= sizeof(fsdb->fsdb_name))

{ CERROR("fsname %s is too long\n", fsname); - RETURN(NULL); + RETURN(ERR_PTR(-EINVAL)); }

OBD_ALLOC_PTR(fsdb);
if (!fsdb)

• RETURN(NULL);
  + RETURN(ERR_PTR(-ENOMEM));

strcpy(fsdb->fsdb_name, fsname);
mutex_init(&fsdb->fsdb_mutex);
@@ -380,7 +380,7 @@ err:
name_destroy(&fsdb->fsdb_clilov);
name_destroy(&fsdb->fsdb_clilmv);
OBD_FREE_PTR(fsdb);

• RETURN(NULL);
  + RETURN(ERR_PTR(rc));
  }

static void mgs_free_fsdb(struct mgs_device *mgs, struct fs_db *fsdb)
@@ -443,11 +443,11 @@ int mgs_find_or_make_fsdb(const struct lu_env *env,
CDEBUG(D_MGS, "Creating new db\n");
fsdb = mgs_new_fsdb(env, mgs, name);
/* lock fsdb_mutex until the db is loaded from llogs */

• if (fsdb)
  + if (!IS_ERR(fsdb))
  mutex_lock(&fsdb->fsdb_mutex);
  mutex_unlock(&mgs->mgs_mutex);
• if (!fsdb)
• RETURN(-ENOMEM);
  + if (IS_ERR(fsdb))
  + RETURN(PTR_ERR(fsdb));

if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
/* populate the db from the client llog */

[Gerrit Updater]

Shilong Wang ([e-mail]) uploaded a new patch: http://review.whamcloud.com/14568
Subject: LU-6491 llog: fix wrong return value for too long fsname
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 88b4af7b6e98462ccf8a62252d2442bd9ef8c416

[Peter Jones]

Emoly

Could you please take care of this patch?

Thanks

Peter

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch http://review.whamcloud.com/14568/
Subject: LU-6491 llog: fix wrong return value for too long fsname
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 5b6d23d7fb8de7ae44ca369381a128c78f78bf21

[Peter Jones]

Landed for 2.8