Signed-off-by: NAl Viro <viro@ftp.linux.org.uk>
Signed-off-by: NLen Brown <len.brown@intel.com>
(cherry picked from ef4611613657dfb8af8d336f2f61f08cfcdc9d8a commit)