From f537c33fb29814fe2275715c58d72b08493e7899 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Tue, 2 Jul 2024 22:54:20 +0000 Subject: [PATCH] LU-17848 osd: remove osd_check_stale() for ldiskfs/ZFS This is implemented as a stub function that returns false. Remove the implementations from the OSD and add a check into dt_check_stale(). Test-Parameters: trivial Test-Parameters: trivial fstype=zfs Signed-off-by: Timothy Day Change-Id: Id7fb2c1d1600a3dcc5d278cb2dab5d65a10bdefd Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55606 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/include/dt_object.h | 4 +++- lustre/osd-ldiskfs/osd_handler.c | 5 ----- lustre/osd-zfs/osd_object.c | 6 ------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h index 1c0238b..b969bbb 100644 --- a/lustre/include/dt_object.h +++ b/lustre/include/dt_object.h @@ -2375,7 +2375,9 @@ static inline bool dt_object_stale(struct dt_object *dt) { LASSERT(dt); LASSERT(dt->do_ops); - LASSERT(dt->do_ops->do_check_stale); + + if (!dt->do_ops->do_check_stale) + return false; return dt->do_ops->do_check_stale(dt); } diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index d252df3..3812399 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -5306,10 +5306,6 @@ static int osd_invalidate(const struct lu_env *env, struct dt_object *dt) return 0; } -static bool osd_check_stale(struct dt_object *dt) -{ - return false; -} /* * Index operations. */ @@ -5498,7 +5494,6 @@ static const struct dt_object_operations osd_obj_ops = { .do_xattr_list = osd_xattr_list, .do_object_sync = osd_object_sync, .do_invalidate = osd_invalidate, - .do_check_stale = osd_check_stale, }; static const struct dt_object_operations osd_obj_otable_it_ops = { diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c index 57260ee..8491981 100644 --- a/lustre/osd-zfs/osd_object.c +++ b/lustre/osd-zfs/osd_object.c @@ -2183,11 +2183,6 @@ static int osd_invalidate(const struct lu_env *env, struct dt_object *dt) return 0; } -static bool osd_check_stale(struct dt_object *dt) -{ - return false; -} - static const struct dt_object_operations osd_obj_ops = { .do_read_lock = osd_read_lock, .do_write_lock = osd_write_lock, @@ -2215,7 +2210,6 @@ static const struct dt_object_operations osd_obj_ops = { .do_xattr_list = osd_xattr_list, .do_object_sync = osd_object_sync, .do_invalidate = osd_invalidate, - .do_check_stale = osd_check_stale, }; static const struct lu_object_operations osd_lu_obj_ops = { -- 1.8.3.1