RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #32548 into master

Browse Source 
* refs/pull/32548/head:
	libcephfs: fix documentation for ceph_seekdir offset
	client: propagate -ENOTCONN errors for ll_releasedir

Reviewed-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-01-10 14:21:11 -08:00
commit 15f8db42ad
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/cephfs/libcephfs.h
View File

@ -615,7 +615,7 @@ int64_t ceph_telldir(struct ceph_mount_info *cmount, struct ceph_dir_result *dir
* @param cmount the ceph mount handle to use for performing the seekdir.
* @param dirp the directory stream pointer to move.
* @param offset the position to move the directory stream to. This offset should be
* a value returned by seekdir. Note that this value does not refer to the nth
* a value returned by telldir. Note that this value does not refer to the nth
* entry in a directory, and can not be manipulated with plus or minus.
*/
void ceph_seekdir(struct ceph_mount_info *cmount, struct ceph_dir_result *dirp, int64_t offset);

3
src/libcephfs.cc
View File

@ -1801,8 +1801,7 @@ extern "C" int ceph_ll_opendir(class ceph_mount_info *cmount,
extern "C" int ceph_ll_releasedir(class ceph_mount_info *cmount,
ceph_dir_result *dir)
{
(void) cmount->get_client()->ll_releasedir(reinterpret_cast<dir_result_t*>(dir));
return (0);
return cmount->get_client()->ll_releasedir(reinterpret_cast<dir_result_t*>(dir));
}
extern "C" int ceph_ll_rename(class ceph_mount_info *cmount,