diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-11 11:20:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-11 11:20:48 -0700 |
commit | 2bfc37cdef08844c77f801a1beaa1f4efd3215df (patch) | |
tree | 6801da509ed0cbcd05dc6e2618bb910195b92d28 /fs/fuse/fuse_i.h | |
parent | Merge tag 'iommu-fixes-v4.13-rc4' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | fuse: set mapping error in writepage_locked when it fails (diff) | |
download | linux-2bfc37cdef08844c77f801a1beaa1f4efd3215df.tar.gz linux-2bfc37cdef08844c77f801a1beaa1f4efd3215df.tar.bz2 linux-2bfc37cdef08844c77f801a1beaa1f4efd3215df.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse fixes from Miklos Szeredi:
"Fix a few bugs in fuse"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: set mapping error in writepage_locked when it fails
fuse: Dont call set_page_dirty_lock() for ITER_BVEC pages for async_dio
fuse: initialize the flock flag in fuse_file on allocation
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r-- | fs/fuse/fuse_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 1bd7ffdad593..bd4d2a3e1ec1 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -249,6 +249,7 @@ struct fuse_io_priv { size_t size; __u64 offset; bool write; + bool should_dirty; int err; struct kiocb *iocb; struct file *file; |