projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
pagelist.c
diff --git
a/fs/nfs/pagelist.c
b/fs/nfs/pagelist.c
index d57190a0d533134c2376c6556a8102e88996dd18..282b3936951060a2c8a6216c4c690e166a5fcb8d 100644
(file)
--- a/
fs/nfs/pagelist.c
+++ b/
fs/nfs/pagelist.c
@@
-938,7
+938,7
@@
static bool nfs_can_coalesce_requests(struct nfs_page *prev,
if (prev) {
if (!nfs_match_open_context(req->wb_context, prev->wb_context))
return false;
if (prev) {
if (!nfs_match_open_context(req->wb_context, prev->wb_context))
return false;
- flctx =
req->wb_context->dentry->d_inode
->i_flctx;
+ flctx =
d_inode(req->wb_context->dentry)
->i_flctx;
if (flctx != NULL &&
!(list_empty_careful(&flctx->flc_posix) &&
list_empty_careful(&flctx->flc_flock)) &&
if (flctx != NULL &&
!(list_empty_careful(&flctx->flc_posix) &&
list_empty_careful(&flctx->flc_flock)) &&