diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-22 20:07:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-22 20:07:47 +0100 |
| commit | 4541c226057ab55f2ad6a330a0bb519a0000f9ba (patch) | |
| tree | f7bb2cac51a10245a2d8935515c2015b91e344be /fs | |
| parent | Merge tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | LZ4 : fix the data abort issue (diff) | |
| download | linux-4541c226057ab55f2ad6a330a0bb519a0000f9ba.tar.xz linux-4541c226057ab55f2ad6a330a0bb519a0000f9ba.zip | |
Merge tag 'driver-core-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are two bugfixes for things reported. One regression in kernfs,
and another issue fixed in the LZ4 code that was fixed in the
"upstream" codebase that solves a reported kernel crash
Both have been in linux-next for a while"
* tag 'driver-core-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
LZ4 : fix the data abort issue
kernfs: handle poll correctly on 'direct_read' files.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/kernfs/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index b684e8a132e6..2bacb9988566 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -207,6 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of, goto out_free; } + of->event = atomic_read(&of->kn->attr.open->event); ops = kernfs_ops(of->kn); if (ops->read) len = ops->read(of, buf, len, *ppos); |