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

Merge pull request #8652 from JiYou/fix-cephfs

Browse Source 
cephfs: should close file handler before exit in cephfs.cc

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2016-06-03 12:46:03 +01:00
commit 04f49df63b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cephfs.cc
View File

@ -57,6 +57,9 @@ int main (int argc, char **argv) {
if (init_options(argc, argv, &fd, &path, &cmd, &stripe_unit, &stripe_count, if (init_options(argc, argv, &fd, &path, &cmd, &stripe_unit, &stripe_count,
&object_size, &pool, &file_offset, &dir)){ &object_size, &pool, &file_offset, &dir)){
usage(); usage();
if (fd >= 0) {
close(fd);
}
return 0; return 0;
} }
@ -69,7 +72,7 @@ int main (int argc, char **argv) {
err = ioctl(fd, CEPH_IOC_GET_LAYOUT, (unsigned long)&layout); err = ioctl(fd, CEPH_IOC_GET_LAYOUT, (unsigned long)&layout);
if (err) { if (err) {
cerr << "Error getting layout: " << cpp_strerror(errno) << endl; cerr << "Error getting layout: " << cpp_strerror(errno) << endl;
return 1; goto close_fd_exit;
} }
if (layout.stripe_unit == 0) { if (layout.stripe_unit == 0) {
cerr << "layout not specified" << endl; cerr << "layout not specified" << endl;
@ -85,7 +88,7 @@ int main (int argc, char **argv) {
err = ioctl(fd, CEPH_IOC_GET_DATALOC, (unsigned long)&location); err = ioctl(fd, CEPH_IOC_GET_DATALOC, (unsigned long)&location);
if (err) { if (err) {
cerr << "Error getting location: " << cpp_strerror(err) << endl; cerr << "Error getting location: " << cpp_strerror(err) << endl;
return 1; goto close_fd_exit;
} }
cout << "location.file_offset: " << location.file_offset << endl; cout << "location.file_offset: " << location.file_offset << endl;
cout << "location.object_offset:" << location.object_offset << endl; cout << "location.object_offset:" << location.object_offset << endl;
@ -102,7 +105,7 @@ int main (int argc, char **argv) {
int ioctl_num = (dir ? CEPH_IOC_SET_LAYOUT_POLICY : CEPH_IOC_SET_LAYOUT); int ioctl_num = (dir ? CEPH_IOC_SET_LAYOUT_POLICY : CEPH_IOC_SET_LAYOUT);
if (pool == -1) { if (pool == -1) {
cerr << "Pool not specified (use --pool <name or id>)" << endl; cerr << "Pool not specified (use --pool <name or id>)" << endl;
return 1; goto close_fd_exit;
} }
layout.data_pool = pool; layout.data_pool = pool;
layout.object_size = object_size; layout.object_size = object_size;
@ -112,14 +115,14 @@ int main (int argc, char **argv) {
err = ioctl(fd, ioctl_num, (unsigned long)&layout); err = ioctl(fd, ioctl_num, (unsigned long)&layout);
if (err) { if (err) {
cerr << "Error setting layout: " << cpp_strerror(errno) << endl; cerr << "Error setting layout: " << cpp_strerror(errno) << endl;
return 1; goto close_fd_exit;
} }
} else if (CMD_MAP == cmd) { } else if (CMD_MAP == cmd) {
struct stat st; struct stat st;
err = ::fstat(fd, &st); err = ::fstat(fd, &st);
if (err < 0) { if (err < 0) {
cerr << "error statting file: " << cpp_strerror(errno) << endl; cerr << "error statting file: " << cpp_strerror(errno) << endl;
return 1; goto close_fd_exit;
} }
struct ceph_ioctl_layout layout; struct ceph_ioctl_layout layout;
@ -127,7 +130,7 @@ int main (int argc, char **argv) {
err = ioctl(fd, CEPH_IOC_GET_LAYOUT, (unsigned long)&layout); err = ioctl(fd, CEPH_IOC_GET_LAYOUT, (unsigned long)&layout);
if (err) { if (err) {
cerr << "Error getting layout: " << cpp_strerror(errno) << endl; cerr << "Error getting layout: " << cpp_strerror(errno) << endl;
return 1; goto close_fd_exit;
} }
printf("%15s %24s %12s %12s %s\n", printf("%15s %24s %12s %12s %s\n",
@ -139,7 +142,7 @@ int main (int argc, char **argv) {
err = ioctl(fd, CEPH_IOC_GET_DATALOC, (unsigned long)&location); err = ioctl(fd, CEPH_IOC_GET_DATALOC, (unsigned long)&location);
if (err) { if (err) {
cerr << "Error getting location: " << cpp_strerror(errno) << endl; cerr << "Error getting location: " << cpp_strerror(errno) << endl;
return 1; goto close_fd_exit;
} }
printf("%15lld %24s %12lld %12lld %d\n", printf("%15lld %24s %12lld %12lld %d\n",
off, location.object_name, (long long)location.object_offset, off, location.object_name, (long long)location.object_offset,
@ -149,10 +152,16 @@ int main (int argc, char **argv) {
} else { } else {
cerr << "unknown cmd somehow set!" << endl; cerr << "unknown cmd somehow set!" << endl;
usage(); usage();
return 1; goto close_fd_exit;
} }
return 0; return 0;
close_fd_exit:
if (fd >= 0) {
close(fd);
}
return 1;
} }