Use only layoutreturn constant for both returns and recalls. (return_* works better for recall_type rather the other way around) Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> --- include/linux/nfs4.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index a899cff..8a53213 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -554,13 +554,7 @@ enum pnfs_layouttype { LAYOUT_BLOCK_VOLUME = 3, }; -/* FIXME: should recall and return types be combined? */ -enum pnfs_layoutrecall_type { - RECALL_FILE = 1, - RECALL_FSID = 2, - RECALL_ALL = 3 -}; - +/* used for both layout return and recall */ enum pnfs_layoutreturn_type { RETURN_FILE = 1, RETURN_FSID = 2, -- 1.6.5.1 -- 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