summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trondmy@gmail.com>2018-08-23 11:02:49 -0400
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2018-09-14 16:23:16 -0400
commit2a534a7473bf4e7f1c12805113f80c795fc8e89a (patch)
treecc5baf1d49ac497a750f9761d7a9bb1070f42af3 /fs/nfs
parent0af4c8be97a14d1df8a78b4993a09e8dff545a18 (diff)
downloadblackbird-op-linux-2a534a7473bf4e7f1c12805113f80c795fc8e89a.tar.gz
blackbird-op-linux-2a534a7473bf4e7f1c12805113f80c795fc8e89a.zip
NFSv4: Fix a tracepoint Oops in initiate_file_draining()
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 <trond.myklebust@hammerspace.com> Cc: stable@vger.kernel.org # v4.17+ Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4trace.h2
1 files changed, 1 insertions, 1 deletions
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 {
OpenPOWER on IntegriCloud