summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-01-14 17:00:14 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-01-14 17:00:14 +0000
commit455791f265e6e581fa4ebddd5dc4642b2201f8ce (patch)
treeebd5cad9534291822f8c47dbbc8162525f8fe92e /api
parent92eaa72ea4cd0d06c2161842c548008db0eee01c (diff)
parent7d89ec77763dc5076379753c736f7fce2bedd9ec (diff)
Merge branch 'upstream' into merge
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs-fops.c12
-rw-r--r--api/src/glfs.c4
2 files changed, 10 insertions, 6 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 8d905193a..e1fa697f9 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -752,10 +752,14 @@ glfs_preadv_async (struct glfs_fd *glfd, const struct iovec *iovec, int count,
offset, flags, NULL);
out:
- if (ret) {
- GF_FREE (gio->iov);
- GF_FREE (gio);
- STACK_DESTROY (frame->root);
+ if (ret) {
+ if (gio) {
+ GF_FREE (gio->iov);
+ GF_FREE (gio);
+ }
+ if (frame) {
+ STACK_DESTROY (frame->root);
+ }
glfs_subvol_done (fs, subvol);
}
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 29ed47c0c..1bae78d23 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -666,8 +666,8 @@ glfs_fini (struct glfs *fs)
glfs_subvol_done (fs, subvol);
- if (ctx->log.logfile)
- fclose (ctx->log.logfile);
+ if (gf_log_fini(ctx) != 0)
+ ret = -1;
return ret;
}