Patch converts a bunch of places that hadn't been caught when ->s_id was introduced. Please, apply.
Attach a file by drag & drop or click to upload
