Return-Path: Received: from mail-it0-f66.google.com ([209.85.214.66]:37689 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727303AbeIEWj1 (ORCPT ); Wed, 5 Sep 2018 18:39:27 -0400 Received: by mail-it0-f66.google.com with SMTP id h20-v6so10647153itf.2 for ; Wed, 05 Sep 2018 11:08:09 -0700 (PDT) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/4] NFSv4: Fix a tracepoint Oops in initiate_file_draining() Date: Wed, 5 Sep 2018 14:07:13 -0400 Message-Id: <20180905180715.99485-2-trond.myklebust@hammerspace.com> In-Reply-To: <20180905180715.99485-1-trond.myklebust@hammerspace.com> References: <20180905180715.99485-1-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org List-ID: Now that the value of 'ino' can be NULL or an ERR_PTR(), we need to change the test in the tracepoint. Fixes: ce5624f7e6675 ("NFSv4: Return NFS4ERR_DELAY when a layout fails...") Signed-off-by: Trond Myklebust --- fs/nfs/nfs4trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index a275fba93170..708342f4692f 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -1194,7 +1194,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event, TP_fast_assign( __entry->error = error; __entry->fhandle = nfs_fhandle_hash(fhandle); - if (inode != NULL) { + if (!IS_ERR_OR_NULL(inode)) { __entry->fileid = NFS_FILEID(inode); __entry->dev = inode->i_sb->s_dev; } else { -- 2.17.1