> void nfsd4_setup_layout_type(struct svc_export *exp) > { > +#if defined(CONFIG_NFSD_BLOCKLAYOUT) || defined(CONFIG_NFSD_SCSILAYOUT) > struct super_block *sb = exp->ex_path.mnt->mnt_sb; > +#endif > > if (!(exp->ex_flags & NFSEXP_PNFS)) > return; > > /* > - * Check if the file system supports exporting a block-like layout. > + * If flex file is configured, use it by default. Otherwise > + * check if the file system supports exporting a block-like layout. > * If the block device supports reservations prefer the SCSI layout, > * otherwise advertise the block layout. > */ > +#ifdef CONFIG_NFSD_FLEXFILELAYOUT > + exp->ex_layout_type = LAYOUT_FLEX_FILES; > +#endif > #ifdef CONFIG_NFSD_BLOCKLAYOUT > + /* overwrite flex file layout selection if needed */ So my evil attempt to let you take on the multi-layout support didn't pan out :) But given that we don't enable pnfs by defaul this should still be ok, so: Reviewed-by: Christoph Hellwig <hch@xxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html