add extra check for volumes to avoid skipping ones we really want, also fix shadow warning
add extra check for volumes to avoid skipping ones we really want, also fix shadow warning


SVN revision: 74806

tizenorg/platform.upstream.enlightenment,tasn/enlightenment,tizenorg/platform.upstream.enlightenment,FlorentRevest/Enlightenment,rvandegrift/e,FlorentRevest/Enlightenment,tasn/enlightenment,rvandegrift/e,tasn/enlightenment,FlorentRevest/Enlightenment,tizenorg/platform.upstream.enlightenment,rvandegrift/e