diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-07 08:54:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-07 08:54:22 +0100 |
| commit | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (patch) | |
| tree | c8a7272eaa8c21434e0c7a118879dbacb83f004a /fs/nfs/nfs4trace.h | |
| parent | Revert "fs: do not prefault sys_write() user buffer pages" (diff) | |
| parent | NFS: Fix a tracepoint NULL-pointer dereference (diff) | |
| download | linux-dev-a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b.tar.xz linux-dev-a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b.zip | |
Merge tag 'nfs-for-4.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
"Highlights include:
Bugfixes:
- Fix a use-after-free bug in the RPC/RDMA client
- Fix a write performance regression
- Fix up page writeback accounting
- Don't try to reclaim unused state owners
- Fix a NFSv4 nograce recovery hang
- reset states to use open_stateid when returning delegation
voluntarily
- Fix a tracepoint NULL-pointer dereference"
* tag 'nfs-for-4.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFS: Fix a tracepoint NULL-pointer dereference
nfs4: reset states to use open_stateid when returning delegation voluntarily
NFSv4: Fix a nograce recovery hang
NFSv4.1: nfs4_opendata_check_deleg needs to handle NFS4_OPEN_CLAIM_DELEG_CUR_FH
NFSv4: Don't try to reclaim unused state owners
NFS: Fix a write performance regression
NFS: Fix up page writeback accounting
xprtrdma: disconnect and flush cqs before freeing buffers
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 28df12e525ba..671cf68fe56b 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); |