Skip to content

Commit

Permalink
orangefs: Dan Carpenter influenced cleanups...
Browse files Browse the repository at this point in the history
This patch is simlar to one Dan Carpenter sent me, cleans
up some return codes and whitespace errors. There was one
place where he thought inserting an error message into
the ring buffer might be too chatty, I hope I convinced him
othewise. As a consolation <g> I changed a truly chatty
error message in another location into a debug message,
system-admins had already yelled at me about that one...

Signed-off-by: Mike Marshall <hubcap@omnibond.com>
  • Loading branch information
hubcapsc committed Feb 9, 2017
1 parent 70823b9 commit 05973c2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
5 changes: 3 additions & 2 deletions fs/orangefs/devorangefs-req.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,9 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
/* remove the op from the in progress hash table */
op = orangefs_devreq_remove_op(head.tag);
if (!op) {
gossip_err("WARNING: No one's waiting for tag %llu\n",
llu(head.tag));
gossip_debug(GOSSIP_DEV_DEBUG,
"%s: No one's waiting for tag %llu\n",
__func__, llu(head.tag));
return ret;
}

Expand Down
15 changes: 8 additions & 7 deletions fs/orangefs/orangefs-debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -965,13 +965,13 @@ int orangefs_debugfs_new_client_string(void __user *arg)
int ret;

ret = copy_from_user(&client_debug_array_string,
(void __user *)arg,
ORANGEFS_MAX_DEBUG_STRING_LEN);
(void __user *)arg,
ORANGEFS_MAX_DEBUG_STRING_LEN);

if (ret != 0) {
pr_info("%s: CLIENT_STRING: copy_from_user failed\n",
__func__);
return -EIO;
return -EFAULT;
}

/*
Expand All @@ -986,17 +986,18 @@ int orangefs_debugfs_new_client_string(void __user *arg)
*/
client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN - 1] =
'\0';

pr_info("%s: client debug array string has been received.\n",
__func__);

if (!help_string_initialized) {

/* Build a proper debug help string. */
if (orangefs_prepare_debugfs_help_string(0)) {
ret = orangefs_prepare_debugfs_help_string(0);
if (ret) {
gossip_err("%s: no debug help string \n",
__func__);
return -EIO;
return ret;
}

}
Expand All @@ -1009,7 +1010,7 @@ int orangefs_debugfs_new_client_string(void __user *arg)

help_string_initialized++;

return ret;
return 0;
}

int orangefs_debugfs_new_debug(void __user *arg)
Expand Down

0 comments on commit 05973c2

Please sign in to comment.