diff options
Diffstat (limited to 'fs/nfs/objlayout/objio_osd.c')
-rw-r--r-- | fs/nfs/objlayout/objio_osd.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 8c2bd3eb8e8d..3b10d09e5210 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c | |||
@@ -988,18 +988,6 @@ ssize_t objio_write_pagelist(struct objlayout_io_state *ol_state, bool stable) | |||
988 | return _write_exec(ios); | 988 | return _write_exec(ios); |
989 | } | 989 | } |
990 | 990 | ||
991 | /* | ||
992 | * objlayout_pg_test(). Called by nfs_can_coalesce_requests() | ||
993 | * | ||
994 | * return true iff coalesce page | ||
995 | */ | ||
996 | bool | ||
997 | objlayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, | ||
998 | struct nfs_page *req) | ||
999 | { | ||
1000 | return true; | ||
1001 | } | ||
1002 | |||
1003 | static struct pnfs_layoutdriver_type objlayout_type = { | 991 | static struct pnfs_layoutdriver_type objlayout_type = { |
1004 | .id = LAYOUT_OSD2_OBJECTS, | 992 | .id = LAYOUT_OSD2_OBJECTS, |
1005 | .name = "LAYOUT_OSD2_OBJECTS", | 993 | .name = "LAYOUT_OSD2_OBJECTS", |
@@ -1013,7 +1001,7 @@ static struct pnfs_layoutdriver_type objlayout_type = { | |||
1013 | 1001 | ||
1014 | .read_pagelist = objlayout_read_pagelist, | 1002 | .read_pagelist = objlayout_read_pagelist, |
1015 | .write_pagelist = objlayout_write_pagelist, | 1003 | .write_pagelist = objlayout_write_pagelist, |
1016 | .pg_test = objlayout_pg_test, | 1004 | .pg_test = pnfs_generic_pg_test, |
1017 | 1005 | ||
1018 | .free_deviceid_node = objio_free_deviceid_node, | 1006 | .free_deviceid_node = objio_free_deviceid_node, |
1019 | 1007 | ||