From: Patrick Farrell Date: Wed, 28 Feb 2024 02:38:04 +0000 (-0500) Subject: LU-15367 llite: add 'rc' to all iotrace messages X-Git-Tag: 2.15.62~101 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=49f230e10d11c3560680b00a5ffba4c655cf204d;p=fs%2Flustre-release.git LU-15367 llite: add 'rc' to all iotrace messages It's easy to add the return code to iotrace, so let's do it. Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Ic2357d3d32fd4954e96878174f13b7fe907df2df Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52007 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Sebastien Buisson Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 64863b9..b1e6f0d 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -464,9 +464,10 @@ out: ll_stats_ops_tally(sbi, LPROC_LL_RELEASE, ktime_us_delta(ktime_get(), kstart)); CDEBUG(D_IOTRACE, - "COMPLETED file %s:"DFID"(%p), flags %o\n", + "COMPLETED file %s:"DFID"(%p), flags %o, rc = %d\n", file_dentry(file)->d_name.name, - PFID(ll_inode2fid(file_inode(file))), inode, file->f_flags); + PFID(ll_inode2fid(file_inode(file))), inode, file->f_flags, + rc); RETURN(rc); } @@ -1090,9 +1091,10 @@ out_nofiledata: } CDEBUG(D_IOTRACE, - "COMPLETED file %s:"DFID"(%p), flags %o\n", + "COMPLETED file %s:"DFID"(%p), flags %o, rc = %d\n", file_dentry(file)->d_name.name, - PFID(ll_inode2fid(file_inode(file))), inode, file->f_flags); + PFID(ll_inode2fid(file_inode(file))), inode, file->f_flags, + rc); return rc; } @@ -2269,10 +2271,10 @@ out: } CDEBUG(D_IOTRACE, - "COMPLETED: file %s:"DFID", ppos: %lld, count: %zu\n", + "COMPLETED: file %s:"DFID", ppos: %lld, count: %zu, rc = %zu\n", file_dentry(file)->d_name.name, PFID(ll_inode2fid(file_inode(file))), iocb->ki_pos, - iov_iter_count(to)); + iov_iter_count(to), result); RETURN(result); } @@ -2433,10 +2435,10 @@ out: } CDEBUG(D_IOTRACE, - "COMPLETED: file %s:"DFID", ppos: %lld, count: %zu\n", + "COMPLETED: file %s:"DFID", ppos: %lld, count: %zu, rc = %zu\n", file_dentry(file)->d_name.name, PFID(ll_inode2fid(file_inode(file))), iocb->ki_pos, - iov_iter_count(from)); + iov_iter_count(from), rc_normal); RETURN(rc_normal); } @@ -4918,7 +4920,7 @@ static loff_t ll_file_seek(struct file *file, loff_t offset, int origin) ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_LLSEEK, ktime_us_delta(ktime_get(), kstart)); CDEBUG(D_VFSTRACE|D_IOTRACE, - "COMPLETED file %s:"DFID", offset: %lld, type: %s, result: %lld\n", + "COMPLETED file %s:"DFID", offset: %lld, type: %s, rc = %lld\n", file_dentry(file)->d_name.name, PFID(ll_inode2fid(file_inode(file))), offset, ll_seek_names[origin], retval); diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 4649227..8af16cb 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -2522,13 +2522,13 @@ out: ktime_us_delta(ktime_get(), kstart)); clear: CDEBUG(D_VFSTRACE|D_IOTRACE, - "COMPLETED file %s:"DFID"(%p) current size %llu, valid attrs %x, mode %x, uid %d, gid %d, new size %llu, atime %lld.%.9ld, mtime %lld.%.9ld, ctime %lld.%.9ld\n", + "COMPLETED file %s:"DFID"(%p) current size %llu, valid attrs %x, mode %x, uid %d, gid %d, new size %llu, atime %lld.%.9ld, mtime %lld.%.9ld, ctime %lld.%.9ld, rc %d\n", dentry->d_name.name, PFID(ll_inode2fid(inode)), inode, i_size_read(inode), attr->ia_valid, attr->ia_mode, attr->ia_uid.val, attr->ia_gid.val, attr->ia_size, (long long) attr->ia_atime.tv_sec, attr->ia_atime.tv_nsec, (long long) attr->ia_mtime.tv_sec, attr->ia_mtime.tv_nsec, - (long long) attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec); + (long long) attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec, rc); ll_clear_inode_lock_owner(inode); diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c index b73572c..d83915c 100644 --- a/lustre/llite/llite_mmap.c +++ b/lustre/llite/llite_mmap.c @@ -460,9 +460,10 @@ out: } CDEBUG(D_IOTRACE, - "COMPLETED: "DFID": vma=%p start=%#lx end=%#lx vm_flags=%#lx idx=%lu\n", + "COMPLETED: "DFID": vma=%p start=%#lx end=%#lx vm_flags=%#lx idx=%lu, rc %d\n", PFID(&ll_i2info(file_inode(vma->vm_file))->lli_fid), - vma, vma->vm_start, vma->vm_end, vma->vm_flags, vmf->pgoff); + vma, vma->vm_start, vma->vm_end, vma->vm_flags, vmf->pgoff, + result); return result; } @@ -540,10 +541,10 @@ out: } CDEBUG(D_IOTRACE, - "COMPLETED: "DFID": vma=%p start=%#lx end=%#lx vm_flags=%#lx idx=%lu\n", + "COMPLETED: "DFID": vma=%p start=%#lx end=%#lx vm_flags=%#lx idx=%lu, rc %d\n", PFID(&ll_i2info(file_inode(vma->vm_file))->lli_fid), vma, vma->vm_start, vma->vm_end, vma->vm_flags, - vmf->page->index); + vmf->page->index, result); return result; }