diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:51:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:51:50 +0100 |
commit | ddd1bd5cfde57973ba816e118c9c452934bb09e7 (patch) | |
tree | d90457baeb0bcc9d81cd1ea3a9d8c24cf9745d64 /fs/ocfs2/export.c | |
parent | e8e94fce14658defc659021a50d4253a681d02e7 (diff) | |
parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
download | lwn-ddd1bd5cfde57973ba816e118c9c452934bb09e7.tar.gz lwn-ddd1bd5cfde57973ba816e118c9c452934bb09e7.zip |
Merge tag 'v4.20-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ocfs2/export.c')
-rw-r--r-- | fs/ocfs2/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 9f88188060db..4bf8d5854b27 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c @@ -125,10 +125,10 @@ check_err: check_gen: if (handle->ih_generation != inode->i_generation) { - iput(inode); trace_ocfs2_get_dentry_generation((unsigned long long)blkno, handle->ih_generation, inode->i_generation); + iput(inode); result = ERR_PTR(-ESTALE); goto bail; } |