diff options
| author | Jens Axboe <axboe@fb.com> | 2015-06-01 14:36:02 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-06-01 14:36:02 -0600 |
| commit | 843e8ddb250b5e8ff157b4096277c0c54102905c (patch) | |
| tree | 169324abeb95a20b8f77e7cead08c983264716fa /fs/buffer.c | |
| parent | 75619bfa904d0f2840b4274eb92ce47b2e1c472e (diff) | |
| parent | f26cdc8536ad50fb802a0445f836b4f94ca09ae7 (diff) | |
Merge branch 'for-4.2/core' into for-4.2/drivers
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index efd85e0e8660..f96173ad62d9 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2996,7 +2996,6 @@ void guard_bio_eod(int rw, struct bio *bio) int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags) { struct bio *bio; - int ret = 0; BUG_ON(!buffer_locked(bh)); BUG_ON(!buffer_mapped(bh)); @@ -3038,7 +3037,7 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags) rw |= REQ_PRIO; submit_bio(rw, bio); - return ret; + return 0; } EXPORT_SYMBOL_GPL(_submit_bh); |