diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-02-05 16:48:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-05 16:48:08 -0800 |
| commit | a45614f0a4cceeb2acb5cfd088dd23ea341aaa94 (patch) | |
| tree | c5231c390cf5e2f911a6691ab9f07c3d52f47f0f /include/linux | |
| parent | b27a053258dbbb505147b429e716a08c74a26918 (diff) | |
| parent | dd21e159de67974e3de0791a7175edb4fb2ce7a1 (diff) | |
Merge "Merge android-4.4.172 (b3e9e81) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/backing-dev-defs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index de1414ada5a1..a6296c2ffd93 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -137,6 +137,7 @@ struct bdi_writeback { struct backing_dev_info { struct list_head bdi_list; unsigned long ra_pages; /* max readahead in PAGE_CACHE_SIZE units */ + unsigned long io_pages; /* max allowed IO size */ unsigned int capabilities; /* Device capabilities */ congested_fn *congested_fn; /* Function pointer if device is md/dm */ void *congested_data; /* Pointer to aux data for congested func */ @@ -227,6 +228,14 @@ static inline void wb_get(struct bdi_writeback *wb) */ static inline void wb_put(struct bdi_writeback *wb) { + if (WARN_ON_ONCE(!wb->bdi)) { + /* + * A driver bug might cause a file to be removed before bdi was + * initialized. + */ + return; + } + if (wb != &wb->bdi->wb) percpu_ref_put(&wb->refcnt); } |