From 6fc74cd06c82a4f1b8bef9d4f190c8cb710a394d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 27 Jan 2023 11:31:13 +0100 Subject: [PATCH] nfsdtop: Fix for kernel since 5.15 Linux 54357f0c9149 ("tracing: Add migrate-disabled counter to tracing output") added a new counter to the tracing output. Fix expected format. --- nfsdtop/nfsdtop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfsdtop/nfsdtop b/nfsdtop/nfsdtop index df7193e..c8d41a5 100755 --- a/nfsdtop/nfsdtop +++ b/nfsdtop/nfsdtop @@ -125,7 +125,7 @@ sub analyze_trace { open my $p,'<','/sys/kernel/debug/tracing/instances/nfsdtop/trace' or die "/sys/kernel/debug/tracing/instances/nfsdtop/trace: $!\n"; while (<$p>) { /^#/ and next; - my ($taskpid,$cpu,$flags,$time,$op,$addr,$uid,$rest) = /^\s*(\S+)\s+\[(\d+)\]\s+(....)\s+(\d+\.\d*):\s*nfsd4_(\S+): ip=0x(........) uid=(\d+)\s*(.*)/ or die "format: $_"; + my ($taskpid,$cpu,$flags,$time,$op,$addr,$uid,$rest) = /^\s*(\S+)\s+\[(\d+)\]\s+(.....?)\s+(\d+\.\d*):\s*nfsd4_(\S+): ip=0x(........) uid=(\d+)\s*(.*)/ or die "format: $_"; my $u32= my $ip=hostname_by_u32(hex($addr)); my $user=getuser($uid);