diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 10:57:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 10:57:14 -0800 |
| commit | 08d21b5f93eb92a781daea71b6fcb3a340909141 (patch) | |
| tree | 365a88c9d977914a6dd42dcc1c27e33f80c0b76c /include | |
| parent | 627f4b3ee3899bb70263ee77454a43c73136562f (diff) | |
| parent | 19350e7627a6f3b0f662cbd2eb1128c9961a41fe (diff) | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull exofs and ore fixes from Boaz Harrosh:
"The main fix here, the first patch, is also destined for -stable. The
rest is small trivia and cosmetics. The ORE patches effect both exofs
and pnfs-objects very reproducible bugs"
[ ORE is "object raid engine", used by exofs and pnfs - Linus ]
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: Print less in r4w
exofs: Allow corrupted directory entry to be empty file
exofs: Allow O_DIRECT open
ore: Don't crash on NULL bio in _clear_bio
ore: Fix wrong math in allocation of per device BIO
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/osd_ore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/osd_ore.h b/include/scsi/osd_ore.h index a5f9b960dfc..6ca3265a4dc 100644 --- a/include/scsi/osd_ore.h +++ b/include/scsi/osd_ore.h @@ -102,6 +102,7 @@ struct ore_striping_info { unsigned unit_off; unsigned cur_pg; unsigned cur_comp; + unsigned maxdevUnits; }; struct ore_io_state; |