am 1c1b8354: Merge "Define fsid_t as well as __fsid_t."

* commit '1c1b83549f8b96fec4cb7037cf595171909855c2':
  Define fsid_t as well as __fsid_t.