On 03/18/2014 10:09 AM, Christoph Hellwig wrote: >>> + struct nfs_server *server = NFS_SERVER(inode); >>> + const struct nfs_pageio_ops *pg_ops = &nfs_pageio_write_ops; >>> + >>> +#if IS_ENABLED(CONFIG_NFS_V4) >>> + if (server->pnfs_curr_ld) >>> + pg_ops = server->pnfs_curr_ld->pg_write_ops; >>> +#endif >>> + nfs_pageio_init(pgio, inode, pg_ops, compl_ops, server->wsize, ioflags); >>> } >> I thought it was bad style to put a #ifdef in the middle of a function, which is why we have so many noop functions in the rest of the code. Should this be done with a select_compl_ops() function instead? > I don't think it's much of a problem for a small and readable function > with a single ifdef. And we'd need one helper for read and write each, > which would make the code much harder to read. Still better than what's > there currently, though. > > The other option would be to simply always have the pnfs_curr_ld field > in the server structure and remove the ifdef entirely. Okay. If we keep the ifdef, then it should probably check for CONFIG_NFS_V4_1 and not CONFIG_NFS_V4 -- 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
