Commit 06442440 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] break from snprintf loop 



When the debug buffer has filled up, break from the loop and return the
correct number of bytes that have been written.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f6db1b8e

fs/dlm/debug_fs.c

+7 −4
Original line number Diff line number Diff line
@@ -310,16 +310,19 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf, 
{

	struct dlm_ls *ls = file->private_data;

	struct dlm_lkb *lkb;

	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;

	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;



	mutex_lock(&debug_buf_lock);

	mutex_lock(&ls->ls_waiters_mutex);

	memset(debug_buf, 0, sizeof(debug_buf));



	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {

		pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",

		ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",

			       lkb->lkb_id, lkb->lkb_wait_type,

			       lkb->lkb_nodeid, lkb->lkb_resource->res_name);

		if (ret >= len - pos)

			break;

		pos += ret;

	}

	mutex_unlock(&ls->ls_waiters_mutex);