diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-02 16:21:06 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-10 15:04:47 -0800 |
| commit | 9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba (patch) | |
| tree | 1c1bb4d2f769eca05443b98334fe0fbdb3b977c2 /fs/ceph/super.c | |
| parent | 8b6e4f2d8b21c25225b1ce8d53a2e03b92cc8522 (diff) | |
| download | op-kernel-dev-9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba.zip op-kernel-dev-9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba.tar.gz | |
ceph: allow renewal of auth credentials
Add infrastructure to allow the mon_client to periodically renew its auth
credentials. Also add a messenger callback that will force such a renewal
if a peer rejects our authenticator.
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/super.c')
| -rw-r--r-- | fs/ceph/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index cd81c84..3a25489 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -542,7 +542,7 @@ static struct ceph_client *ceph_create_client(struct ceph_mount_args *args) mutex_init(&client->mount_mutex); - init_waitqueue_head(&client->mount_wq); + init_waitqueue_head(&client->auth_wq); client->sb = NULL; client->mount_state = CEPH_MOUNT_MOUNTING; @@ -550,7 +550,7 @@ static struct ceph_client *ceph_create_client(struct ceph_mount_args *args) client->msgr = NULL; - client->mount_err = 0; + client->auth_err = 0; atomic_long_set(&client->writeback_count, 0); err = bdi_init(&client->backing_dev_info); @@ -742,13 +742,13 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt, /* wait */ dout("mount waiting for mon_map\n"); - err = wait_event_interruptible_timeout(client->mount_wq, /* FIXME */ - have_mon_map(client) || (client->mount_err < 0), + err = wait_event_interruptible_timeout(client->auth_wq, + have_mon_map(client) || (client->auth_err < 0), timeout); if (err == -EINTR || err == -ERESTARTSYS) goto out; - if (client->mount_err < 0) { - err = client->mount_err; + if (client->auth_err < 0) { + err = client->auth_err; goto out; } } |
