#include <time.h>
#include <lustre/lustreapi.h>
-#include <lustre/lustre_idl.h>
#define ERROR(fmt, ...) \
fprintf(stderr, "%s: %s:%d: %s: " fmt "\n", \
fd = create_file("foo1", 1000, 'x');
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
fd = open(filename, O_RDONLY);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
fd = open(filename, O_WRONLY);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
fd = open(filename, O_WRONLY);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == -EPERM, "cannot get lease '%s': %s",
filename, strerror(-rc));
fd = open(filename, O_RDONLY);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == -EPERM, "cannot get lease '%s': %s",
filename, strerror(-rc));
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == -EBUSY, "can get lease '%s': %s",
filename, strerror(-rc));
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == -EBUSY, "can get lease '%s': %s",
filename, strerror(-rc));
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
ASSERTF(rc == LL_LEASE_RDLCK,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_RDLCK, "was not able to put back lease '%s': %s",
filename, strerror(-rc));
ASSERTF(rc == 0,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
ASSERTF(rc == LL_LEASE_WRLCK,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_WRLCK, "was not able to put back lease '%s': %s",
filename, strerror(-rc));
ASSERTF(rc == 0,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
for (i = 0; i < 1000; i++) {
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s",
filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_WRLCK,
"was not able to put back lease '%s': %s",
filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s",
filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_RDLCK,
"was not able to put back lease '%s': %s",
filename, strerror(-rc));
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
ASSERTF(rc == LL_LEASE_WRLCK,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_WRLCK, "was not able to put back lease '%s': %s",
filename, strerror(-rc));
ASSERTF(rc == 0,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
fd = open(filename, O_RDWR);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
rc = llapi_lease_check(fd);
ASSERTF(rc == LL_LEASE_RDLCK,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_put(fd);
+ rc = llapi_lease_release(fd);
ASSERTF(rc == LL_LEASE_RDLCK, "was not able to put back lease '%s': %s",
filename, strerror(-rc));
ASSERTF(rc == 0,
"invalid lease type on '%s': %s", filename, strerror(-rc));
- rc = llapi_lease_get(fd, LL_LEASE_WRLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_WRLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
int rc;
char *filename;
int fd;
- lustre_fid fid;
+ struct lu_fid fid;
rc = mkdir(mainpath, 0);
ASSERTF(rc == 0, "mkdir failed for '%s': %s",
O_RDWR | O_NOATIME | O_NONBLOCK | O_NOFOLLOW);
ASSERTF(fd >= 0, "open failed for '%s': %s", filename, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", filename, strerror(-rc));
close(fd);
fd = open(mainpath, O_DIRECTORY);
ASSERTF(fd >= 0, "open failed for '%s': %s", mainpath, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == -ENOTTY, "can get lease on directory '%s': %s",
mainpath, strerror(-rc));
fd = open(fsmountdir, O_DIRECTORY);
ASSERTF(fd >= 0, "open failed for '%s': %s", mainpath, strerror(errno));
- rc = llapi_lease_get(fd, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd, LL_LEASE_RDLCK);
ASSERTF(rc == -ENOTTY, "can get lease on directory '%s': %s",
mainpath, strerror(-rc));
fd1 = create_file("foo1", foo1_size, 'x');
fd2 = create_file("foo2", foo2_size, 'y');
- rc = llapi_lease_get(fd1, LL_LEASE_RDLCK);
+ rc = llapi_lease_acquire(fd1, LL_LEASE_RDLCK);
ASSERTF(rc == 0, "cannot get lease '%s': %s", mainpath, strerror(-rc));
rc = llapi_lease_check(fd1);
rc = llapi_lease_check(fd1);
ASSERTF(rc == 0, "lease not lost on '%s': %s", mainpath, strerror(-rc));
- rc = llapi_lease_put(fd1);
+ rc = llapi_lease_release(fd1);
ASSERTF(rc == -ENOLCK,
"was able to put back lease: %s", strerror(-rc));