RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-09 01:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/filestore: fix omap fsid fd leak during mount()

Browse Source 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
xie xingguo 2016-05-19 20:48:06 +08:00
parent b0b8c2a8dc
commit a58c288b8d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/filestore/FileStore.cc
View File

@ -1585,15 +1585,17 @@ int FileStore::mount()
goto close_current_fd;
}
ret = read_fsid(omap_fsid_fd, &omap_fsid);
VOID_TEMP_FAILURE_RETRY(::close(omap_fsid_fd));
omap_fsid_fd = -1; // defensive
if (ret < 0) {
derr << "FileStore::mount: error reading omap_fsid_fd" << ", omap_fsid = " << omap_fsid
<< cpp_strerror(ret) << dendl;
goto close_fsid_fd;
goto close_current_fd;
}
if (fsid != omap_fsid) {
derr << "FileStore::mount: " << omap_fsid_buf << " has existed omap fsid " << omap_fsid << " != expected osd fsid " << fsid << dendl;
ret = -EINVAL;
goto close_fsid_fd;
goto close_current_fd;
}
}