From 75364dfc4c241fd92adc97f5a4f8ca486b95ab25 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 7 Feb 2018 23:09:47 -0800 Subject: [PATCH] LU-10418 flr: replace llapi_lease_get with llapi_lease_acquire After commit 8f1c7c1e44a4cc8870eb2b2a71da323e265881b4 landed, we need replace llapi_lease_{get,put} with llapi_lease_{acquire,release}. Change-Id: Ie36abeb3c71f2d0c3345de9b4830549af3bb56a3 Test-Parameters: trivial testlist=sanity-flr Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/31221 Tested-by: Jenkins Reviewed-by: Bobi Jam Tested-by: Maloo Reviewed-by: Jinshan Xiong Reviewed-by: Oleg Drokin --- lustre/utils/lfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index 74f2bba..4d2cc6e 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -7068,9 +7068,9 @@ int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr) goto error; } - rc = llapi_lease_get(fd, LL_LEASE_RDLCK); + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); if (rc < 0) { - fprintf(stderr, "%s: '%s' llapi_lease_get failed: %s.\n", + fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n", progname, fname, strerror(errno)); goto close_fd; } @@ -7080,7 +7080,7 @@ int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr) fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; - llapi_lease_put(fd); + llapi_lease_release(fd); goto close_fd; } @@ -7129,7 +7129,7 @@ int verify_mirror_ids(const char *fname, __u16 *mirror_ids, int ids_nr) free_layout: llapi_layout_free(layout); - llapi_lease_put(fd); + llapi_lease_release(fd); close_fd: close(fd); error: @@ -7800,9 +7800,9 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr, goto error; } - rc = llapi_lease_get(fd, LL_LEASE_RDLCK); + rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK); if (rc < 0) { - fprintf(stderr, "%s: '%s' llapi_lease_get failed: %s.\n", + fprintf(stderr, "%s: '%s' llapi_lease_acquire failed: %s.\n", progname, fname, strerror(errno)); goto close_fd; } @@ -7812,7 +7812,7 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr, fprintf(stderr, "%s: '%s' llapi_layout_get_by_fd failed: %s.\n", progname, fname, strerror(errno)); rc = -errno; - llapi_lease_put(fd); + llapi_lease_release(fd); goto close_fd; } @@ -7909,7 +7909,7 @@ int lfs_mirror_verify_file(const char *fname, __u16 *mirror_ids, int ids_nr, free_layout: llapi_layout_free(layout); - llapi_lease_put(fd); + llapi_lease_release(fd); close_fd: close(fd); error: -- 1.8.3.1