diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 09:46:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 09:46:09 -0700 |
| commit | 50f3515828024582402044bcced6804c070c491c (patch) | |
| tree | f9cf25bee56d0ca54acf4d571536268774dc56ed /fs | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
| parent | 4b2a58abd1e17c0ee53c8dded879e015917cca67 (diff) | |
| download | linux-3.10-50f3515828024582402044bcced6804c070c491c.tar.gz linux-3.10-50f3515828024582402044bcced6804c070c491c.tar.bz2 linux-3.10-50f3515828024582402044bcced6804c070c491c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: Create a new key type "ceph".
libceph: Get secret from the kernel keys api when mounting with key=NAME.
ceph: Move secret key parsing earlier.
libceph: fix null dereference when unregistering linger requests
ceph: unlock on error in ceph_osdc_start_request()
ceph: fix possible NULL pointer dereference
ceph: flush msgr_wq during mds_client shutdown
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/mds_client.c | 6 | ||||
| -rw-r--r-- | fs/ceph/super.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index a1ee8fa3a8e..f60b07b0feb 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -3215,9 +3215,15 @@ void ceph_mdsc_destroy(struct ceph_fs_client *fsc) { struct ceph_mds_client *mdsc = fsc->mdsc; + dout("mdsc_destroy %p\n", mdsc); ceph_mdsc_stop(mdsc); + + /* flush out any connection work with references to us */ + ceph_msgr_flush(); + fsc->mdsc = NULL; kfree(mdsc); + dout("mdsc_destroy %p done\n", mdsc); } diff --git a/fs/ceph/super.c b/fs/ceph/super.c index a9e78b4a258..f2f77fd3c14 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -353,7 +353,7 @@ static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt) if (opt->name) seq_printf(m, ",name=%s", opt->name); - if (opt->secret) + if (opt->key) seq_puts(m, ",secret=<hidden>"); if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT) |