diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 10:59:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 10:59:32 +1000 |
| commit | 07abb737e68d688dc1a009549194f9a4ee09491c (patch) | |
| tree | 9aaa53bf37917744c0395677d9031697dd999328 /include | |
| parent | 2f048ce02a69e99114574586aa578193177de80a (diff) | |
| parent | 18230cda09f6821b855eaac0e129df5bd0ad3abe (diff) | |
Merge remote-tracking branch 'file-locks/linux-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/errseq.h | 14 | ||||
| -rw-r--r-- | include/linux/fs.h | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/linux/errseq.h b/include/linux/errseq.h index 9e0d444ac88d..f746bd8fe4d0 100644 --- a/include/linux/errseq.h +++ b/include/linux/errseq.h @@ -1,18 +1,12 @@ +/* + * See Documentation/errseq.rst and lib/errseq.c + */ #ifndef _LINUX_ERRSEQ_H #define _LINUX_ERRSEQ_H -/* See lib/errseq.c for more info */ - typedef u32 errseq_t; -errseq_t __errseq_set(errseq_t *eseq, int err); -static inline void errseq_set(errseq_t *eseq, int err) -{ - /* Optimize for the common case of no error */ - if (unlikely(err)) - __errseq_set(eseq, err); -} - +errseq_t errseq_set(errseq_t *eseq, int err); errseq_t errseq_sample(errseq_t *eseq); int errseq_check(errseq_t *eseq, errseq_t since); int errseq_check_and_advance(errseq_t *eseq, errseq_t *since); diff --git a/include/linux/fs.h b/include/linux/fs.h index 6e1fd5d21248..f8d4ba738e71 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1000,7 +1000,6 @@ struct file_lock { unsigned char fl_type; unsigned int fl_pid; int fl_link_cpu; /* what cpu's list is this on? */ - struct pid *fl_nspid; wait_queue_head_t fl_wait; struct file *fl_file; loff_t fl_start; @@ -2545,6 +2544,8 @@ extern int filemap_fdatawait_range(struct address_space *, loff_t lstart, loff_t lend); extern bool filemap_range_has_page(struct address_space *, loff_t lstart, loff_t lend); +extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart, + loff_t lend); extern int filemap_write_and_wait(struct address_space *mapping); extern int filemap_write_and_wait_range(struct address_space *mapping, loff_t lstart, loff_t lend); @@ -2572,8 +2573,6 @@ extern int __must_check file_write_and_wait_range(struct file *file, * When a writeback error occurs, most filesystems will want to call * filemap_set_wb_err to record the error in the mapping so that it will be * automatically reported whenever fsync is called on the file. - * - * FIXME: mention FS_* flag here? */ static inline void filemap_set_wb_err(struct address_space *mapping, int err) { |