Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34ce4e7c authored by Boaz Harrosh's avatar Boaz Harrosh
Browse files

exofs: debug print even less 



* Last debug trimming left in some stupid print, remove them.
  Fixup some other prints
* Shift printing from inode.c to ios.c
* Add couple of prints when memory allocation fails.

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
parent abe94c75

fs/exofs/inode.c

+13 −10
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int __readpages_done(struct page_collect *pcol, bool do_unlock) 
	else

		good_bytes = pcol->length - resid;



	EXOFS_DBGMSG("readpages_done(0x%lx) good_bytes=0x%llx"

	EXOFS_DBGMSG2("readpages_done(0x%lx) good_bytes=0x%llx"

		     " length=0x%lx nr_pages=%u\n",

		     pcol->inode->i_ino, _LLU(good_bytes), pcol->length,

		     pcol->nr_pages);
@@ -222,7 +222,7 @@ static int __readpages_done(struct page_collect *pcol, bool do_unlock) 
	}



	pcol_free(pcol);

	EXOFS_DBGMSG("readpages_done END\n");

	EXOFS_DBGMSG2("readpages_done END\n");

	return ret;

}
@@ -290,7 +290,7 @@ static int read_exec(struct page_collect *pcol, bool is_sync) 


	atomic_inc(&pcol->sbi->s_curr_pending);



	EXOFS_DBGMSG("read_exec obj=0x%llx start=0x%llx length=0x%lx\n",

	EXOFS_DBGMSG2("read_exec obj=0x%llx start=0x%llx length=0x%lx\n",

		  ios->obj.id, _LLU(ios->offset), pcol->length);



	/* pages ownership was passed to pcol_copy */
@@ -462,7 +462,7 @@ static void writepages_done(struct exofs_io_state *ios, void *p) 
	else

		good_bytes = pcol->length - resid;



	EXOFS_DBGMSG("writepages_done(0x%lx) good_bytes=0x%llx"

	EXOFS_DBGMSG2("writepages_done(0x%lx) good_bytes=0x%llx"

		     " length=0x%lx nr_pages=%u\n",

		     pcol->inode->i_ino, _LLU(good_bytes), pcol->length,

		     pcol->nr_pages);
@@ -490,7 +490,7 @@ static void writepages_done(struct exofs_io_state *ios, void *p) 


	pcol_free(pcol);

	kfree(pcol);

	EXOFS_DBGMSG("writepages_done END\n");

	EXOFS_DBGMSG2("writepages_done END\n");

}



static int write_exec(struct page_collect *pcol)
@@ -527,7 +527,7 @@ static int write_exec(struct page_collect *pcol) 
	}



	atomic_inc(&pcol->sbi->s_curr_pending);

	EXOFS_DBGMSG("write_exec(0x%lx, 0x%llx) start=0x%llx length=0x%lx\n",

	EXOFS_DBGMSG2("write_exec(0x%lx, 0x%llx) start=0x%llx length=0x%lx\n",

		  pcol->inode->i_ino, pcol->pg_first, _LLU(ios->offset),

		  pcol->length);

	/* pages ownership was passed to pcol_copy */
@@ -616,7 +616,7 @@ static int writepage_strip(struct page *page, 


	ret = pcol_add_page(pcol, page, len);

	if (unlikely(ret)) {

		EXOFS_DBGMSG("Failed pcol_add_page "

		EXOFS_DBGMSG2("Failed pcol_add_page "

			     "nr_pages=%u total_length=0x%lx\n",

			     pcol->nr_pages, pcol->length);
@@ -663,7 +663,7 @@ static int exofs_writepages(struct address_space *mapping, 
	if (expected_pages < 32L)

		expected_pages = 32L;



	EXOFS_DBGMSG("inode(0x%lx) wbc->start=0x%llx wbc->end=0x%llx "

	EXOFS_DBGMSG2("inode(0x%lx) wbc->start=0x%llx wbc->end=0x%llx "

		     "nrpages=%lu start=0x%lx end=0x%lx expected_pages=%ld\n",

		     mapping->host->i_ino, wbc->range_start, wbc->range_end,

		     mapping->nrpages, start, end, expected_pages);
@@ -1170,8 +1170,10 @@ static int exofs_update_inode(struct inode *inode, int do_sync) 
	int ret;



	args = kzalloc(sizeof(*args), GFP_KERNEL);

	if (!args)

	if (!args) {

		EXOFS_DBGMSG("Faild kzalloc of args\n");

		return -ENOMEM;

	}



	fcb = &args->fcb;
@@ -1234,7 +1236,8 @@ static int exofs_update_inode(struct inode *inode, int do_sync) 
free_args:

	kfree(args);

out:

	EXOFS_DBGMSG("ret=>%d\n", ret);

	EXOFS_DBGMSG("(0x%lx) do_sync=%d ret=>%d\n",

		     inode->i_ino, do_sync, ret);

	return ret;

}

fs/exofs/ios.c

+32 −6
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 


#include "exofs.h"



#define EXOFS_DBGMSG2(M...) do {} while (0)

/* #define EXOFS_DBGMSG2 EXOFS_DBGMSG */



void exofs_make_credential(u8 cred_a[OSD_CAP_LEN], const struct osd_obj_id *obj)

{

	osd_sec_init_nosec_doall_caps(cred_a, obj, false, true);
@@ -73,6 +76,8 @@ int exofs_get_io_state(struct exofs_sb_info *sbi, struct exofs_io_state** pios) 
	 */

	ios = kzalloc(exofs_io_state_size(sbi->s_numdevs), GFP_KERNEL);

	if (unlikely(!ios)) {

		EXOFS_DBGMSG("Faild kzalloc bytes=%d\n",

			     exofs_io_state_size(sbi->s_numdevs));

		*pios = NULL;

		return -ENOMEM;

	}
@@ -276,6 +281,9 @@ int exofs_sbi_write(struct exofs_io_state *ios) 
				bio = bio_kmalloc(GFP_KERNEL,

						  ios->bio->bi_max_vecs);

				if (unlikely(!bio)) {

					EXOFS_DBGMSG(

					      "Faild to allocate BIO size=%u\n",

					      ios->bio->bi_max_vecs);

					ret = -ENOMEM;

					goto out;

				}
@@ -290,14 +298,21 @@ int exofs_sbi_write(struct exofs_io_state *ios) 


			osd_req_write(or, &ios->obj, ios->offset, bio,

				      ios->length);

/*			EXOFS_DBGMSG("write sync=%d\n", sync);*/

			EXOFS_DBGMSG("write(0x%llx) offset=0x%llx "

				      "length=0x%llx dev=%d\n",

				     _LLU(ios->obj.id), _LLU(ios->offset),

				     _LLU(ios->length), i);

		} else if (ios->kern_buff) {

			osd_req_write_kern(or, &ios->obj, ios->offset,

					   ios->kern_buff, ios->length);

/*			EXOFS_DBGMSG("write_kern sync=%d\n", sync);*/

			EXOFS_DBGMSG2("write_kern(0x%llx) offset=0x%llx "

				      "length=0x%llx dev=%d\n",

				     _LLU(ios->obj.id), _LLU(ios->offset),

				     _LLU(ios->length), i);

		} else {

			osd_req_set_attributes(or, &ios->obj);

/*			EXOFS_DBGMSG("set_attributes sync=%d\n", sync);*/

			EXOFS_DBGMSG2("obj(0x%llx) set_attributes=%d dev=%d\n",

				     _LLU(ios->obj.id), ios->out_attr_len, i);

		}



		if (ios->out_attr)
@@ -335,14 +350,25 @@ int exofs_sbi_read(struct exofs_io_state *ios) 
		if (ios->bio) {

			osd_req_read(or, &ios->obj, ios->offset, ios->bio,

				     ios->length);

/*			EXOFS_DBGMSG("read sync=%d\n", sync);*/

			EXOFS_DBGMSG("read(0x%llx) offset=0x%llx length=0x%llx"

				      " dev=%d\n", _LLU(ios->obj.id),

				     _LLU(ios->offset),

				     _LLU(ios->length),

				     first_dev);

		} else if (ios->kern_buff) {

			osd_req_read_kern(or, &ios->obj, ios->offset,

					   ios->kern_buff, ios->length);

/*			EXOFS_DBGMSG("read_kern sync=%d\n", sync);*/

			EXOFS_DBGMSG2("read_kern(0x%llx) offset=0x%llx "

				      "length=0x%llx dev=%d\n",

				     _LLU(ios->obj.id),

				     _LLU(ios->offset),

				     _LLU(ios->length),

				     first_dev);

		} else {

			osd_req_get_attributes(or, &ios->obj);

/*			EXOFS_DBGMSG("get_attributes sync=%d\n", sync);*/

			EXOFS_DBGMSG2("obj(0x%llx) get_attributes=%d dev=%d\n",

				     _LLU(ios->obj.id), ios->in_attr_len,

				     first_dev);

		}



		if (ios->out_attr)