Commit f51375cd authored by David Howells's avatar David Howells
Browse files

afs: Add a couple of tracepoints to log I/O errors 



Add a couple of tracepoints to log the production of I/O errors within the AFS
filesystem.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 4ac15ea5

fs/afs/cmservice.c

+5 −5
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int afs_deliver_cb_callback(struct afs_call *call) 
	}



	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))

		return -EIO;

		return afs_io_error(call, afs_io_error_cm_reply);



	/* we'll need the file server record as that tells us which set of

	 * vnodes to operate upon */
@@ -368,7 +368,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call) 
	}



	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))

		return -EIO;

		return afs_io_error(call, afs_io_error_cm_reply);



	/* we'll need the file server record as that tells us which set of

	 * vnodes to operate upon */
@@ -409,7 +409,7 @@ static int afs_deliver_cb_probe(struct afs_call *call) 
		return ret;



	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))

		return -EIO;

		return afs_io_error(call, afs_io_error_cm_reply);



	return afs_queue_call_work(call);

}
@@ -490,7 +490,7 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call) 
	}



	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))

		return -EIO;

		return afs_io_error(call, afs_io_error_cm_reply);



	return afs_queue_call_work(call);

}
@@ -573,7 +573,7 @@ static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *call) 
		return ret;



	if (!afs_check_call_state(call, AFS_CALL_SV_REPLYING))

		return -EIO;

		return afs_io_error(call, afs_io_error_cm_reply);



	return afs_queue_call_work(call);

}

fs/afs/dir.c

+11 −7
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ static bool afs_dir_check_page(struct afs_vnode *dvnode, struct page *page, 
			       ntohs(dbuf->blocks[tmp].hdr.magic));

			trace_afs_dir_check_failed(dvnode, off, i_size);

			kunmap(page);

			trace_afs_file_error(dvnode, -EIO, afs_file_error_dir_bad_magic);

			goto error;

		}
@@ -190,9 +191,11 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) 
retry:

	i_size = i_size_read(&dvnode->vfs_inode);

	if (i_size < 2048)

		return ERR_PTR(-EIO);

	if (i_size > 2048 * 1024)

		return ERR_PTR(afs_bad(dvnode, afs_file_error_dir_small));

	if (i_size > 2048 * 1024) {

		trace_afs_file_error(dvnode, -EFBIG, afs_file_error_dir_big);

		return ERR_PTR(-EFBIG);

	}



	_enter("%llu", i_size);
@@ -315,7 +318,8 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) 
/*

 * deal with one block in an AFS directory

 */

static int afs_dir_iterate_block(struct dir_context *ctx,

static int afs_dir_iterate_block(struct afs_vnode *dvnode,

				 struct dir_context *ctx,

				 union afs_xdr_dir_block *block,

				 unsigned blkoff)

{
@@ -365,7 +369,7 @@ static int afs_dir_iterate_block(struct dir_context *ctx, 
				       " (len %u/%zu)",

				       blkoff / sizeof(union afs_xdr_dir_block),

				       offset, next, tmp, nlen);

				return -EIO;

				return afs_bad(dvnode, afs_file_error_dir_over_end);

			}

			if (!(block->hdr.bitmap[next / 8] &

			      (1 << (next % 8)))) {
@@ -373,7 +377,7 @@ static int afs_dir_iterate_block(struct dir_context *ctx, 
				       " %u unmarked extension (len %u/%zu)",

				       blkoff / sizeof(union afs_xdr_dir_block),

				       offset, next, tmp, nlen);

				return -EIO;

				return afs_bad(dvnode, afs_file_error_dir_unmarked_ext);

			}



			_debug("ENT[%zu.%u]: ext %u/%zu",
@@ -442,7 +446,7 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx, 
		 */

		page = req->pages[blkoff / PAGE_SIZE];

		if (!page) {

			ret = -EIO;

			ret = afs_bad(dvnode, afs_file_error_dir_missing_page);

			break;

		}

		mark_page_accessed(page);
@@ -455,7 +459,7 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx, 
		do {

			dblock = &dbuf->blocks[(blkoff % PAGE_SIZE) /

					       sizeof(union afs_xdr_dir_block)];

			ret = afs_dir_iterate_block(ctx, dblock, blkoff);

			ret = afs_dir_iterate_block(dvnode, ctx, dblock, blkoff);

			if (ret != 1) {

				kunmap(page);

				goto out;

fs/afs/internal.h

+11 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,17 @@ static inline void afs_check_for_remote_deletion(struct afs_fs_cursor *fc, 
	}

}



static inline int afs_io_error(struct afs_call *call, enum afs_io_error where)

{

	trace_afs_io_error(call->debug_id, -EIO, where);

	return -EIO;

}



static inline int afs_bad(struct afs_vnode *vnode, enum afs_file_error where)

{

	trace_afs_file_error(vnode, -EIO, where);

	return -EIO;

}



/*****************************************************************************/

/*

fs/afs/mntpt.c

+3 −2
Original line number Diff line number Diff line
@@ -130,9 +130,10 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) 
			goto error_no_page;

		}



		ret = -EIO;

		if (PageError(page))

		if (PageError(page)) {

			ret = afs_bad(AFS_FS_I(d_inode(mntpt)), afs_file_error_mntpt);

			goto error;

		}



		buf = kmap_atomic(page);

		memcpy(devname, buf, size);

fs/afs/rxrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ int afs_extract_data(struct afs_call *call, bool want_more) 
			break;

		case AFS_CALL_COMPLETE:

			kdebug("prem complete %d", call->error);

			return -EIO;

			return afs_io_error(call, afs_io_error_extract);

		default:

			break;

		}