summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-09 15:48:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-09 15:48:34 -0700
commit0d20fbbe82dadc43f50a4ca5346e962de23cf950 (patch)
treeb3d63936aff013d6baa57c2cd9aaa3bade22d91c /fs
parent0ec26fd0698285b31248e34bf1abb022c00f23d6 (diff)
parentaca420bc51f48b0701963ba3a6234442a0cabebd (diff)
downloadlinux-0d20fbbe82dadc43f50a4ca5346e962de23cf950.tar.gz
linux-0d20fbbe82dadc43f50a4ca5346e962de23cf950.tar.bz2
linux-0d20fbbe82dadc43f50a4ca5346e962de23cf950.zip
Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client
* 'for-linus' of git://ceph.newdream.net/git/ceph-client: libceph: fix leak of osd structs during shutdown ceph: fix memory leak ceph: fix encoding of ino only (not relative) paths libceph: fix msgpool
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/mds_client.c2
-rw-r--r--fs/ceph/super.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index fee028b5332e..86c59e16ba74 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1595,7 +1595,7 @@ static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry,
r = build_dentry_path(rdentry, ppath, pathlen, ino, freepath);
dout(" dentry %p %llx/%.*s\n", rdentry, *ino, *pathlen,
*ppath);
- } else if (rpath) {
+ } else if (rpath || rino) {
*ino = rino;
*ppath = rpath;
*pathlen = strlen(rpath);
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index d47c5ec7fb1f..88bacaf385d9 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -813,8 +813,8 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
fsc = create_fs_client(fsopt, opt);
if (IS_ERR(fsc)) {
res = ERR_CAST(fsc);
- kfree(fsopt);
- kfree(opt);
+ destroy_mount_options(fsopt);
+ ceph_destroy_options(opt);
goto out_final;
}