This puts the check in a single place, rather than needing to implement
it twice for v4.0 and v4.1.
Signed-off-by: NAnna Schumaker <Anna.Schumaker@Netapp.com>