do you mind separating out this second hunk into a different patch?  it looks like it is fixing a different problem (that the get_fsid() throws an exception when fsid == None and we don't stick it in the no_fsid list)