diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /fs/nfs/nfs4trace.h | |
| parent | 53e597b1d194910bef53ed0632da329fef497904 (diff) | |
| parent | a5be88f63eaff1c03774aecd7388015cb87f6b2c (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz | |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'fs/nfs/nfs4trace.h')
| -rw-r--r-- | fs/nfs/nfs4trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 28df12e..671cf68 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -409,7 +409,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event, __entry->flags = flags; __entry->fmode = (__force unsigned int)ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev; - if (!IS_ERR(state)) + if (!IS_ERR_OR_NULL(state)) inode = state->inode; if (inode != NULL) { __entry->fileid = NFS_FILEID(inode); |