MFS10 r273767 / MFC r273638:

MFS10 r273767 / MFC r273638:
Revert somewhat hackish geom_disk optimization, committed as part of r256880,
and the following r273143 commit, supposed to workaround introduced issue by
quite innocent-looking change.

While there is no clear understanding why, but r273143 is accused in data
corruption in some environments with high I/O load.  I personally don't see
any problem in that commit, and possibly it is just a trigger to some other
bug somewhere, but better safe then sorry for now.

Requested by:   scottl@
Approved by:	re (kib@)

git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273776 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f