From: Andy Grover <redacted>
Date: Fri, 30 Oct 2009 11:54:52 -0700

These patches fix some small issues with RDS, please review and
apply if ok.

Adding new socket options is not appropriate for -rc* series
submissions.

The changes that fix races and panics are fine, the rest is not.

Please respin your changes properly for net-2.6, and we can add the
socket option and do the other stuff in net-next-2.6

Thanks.