aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/objlayout
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2011-05-25 13:54:40 -0400
committerBoaz Harrosh <bharrosh@panasas.com>2011-05-29 13:56:55 -0400
commit89a58e32d9105c01022a757fb32ddc3b51bf0025 (patch)
treefd04ff022a084339868e81fc9a4679667c2b70bd /fs/nfs/objlayout
parent18ad0a9f2ccd260d37dd6bc5fa04c7819def4c84 (diff)
NFSv4.1: use pnfs_generic_pg_test directly by layout driver
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/objlayout')
-rw-r--r--fs/nfs/objlayout/objio_osd.c14
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 */
996bool
997objlayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
998 struct nfs_page *req)
999{
1000 return true;
1001}
1002
1003static struct pnfs_layoutdriver_type objlayout_type = { 991static 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