diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
| commit | a8fa94e0f2ab665f9aa665195618178b61ed8304 (patch) | |
| tree | 4060502fffd7f56d379372d517f8dcc31bf63955 /net/ceph/messenger.c | |
| parent | 9561a8961c708ff6ba3e71a817af0f16bdc1d885 (diff) | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) | |
Merge branch 'master' into driver-core-next-test-merge-rc2
da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next. The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next. The conflict can be resolved by taking code from
driver-core-next.
Conflicts:
fs/kernfs/dir.c
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 0e478a0f420..30efc5c1862 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -840,9 +840,13 @@ static bool ceph_msg_data_bio_advance(struct ceph_msg_data_cursor *cursor, if (!cursor->bvec_iter.bi_size) { bio = bio->bi_next; - cursor->bvec_iter = bio->bi_iter; + cursor->bio = bio; + if (bio) + cursor->bvec_iter = bio->bi_iter; + else + memset(&cursor->bvec_iter, 0, + sizeof(cursor->bvec_iter)); } - cursor->bio = bio; if (!cursor->last_piece) { BUG_ON(!cursor->resid); |