Commit b612a055 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: clean up on forwarded aborted mds request
  ceph: fix leak of osd authorizer
  ceph: close out mds, osd connections before stopping auth
  ceph: make lease code DN specific
  fs/ceph: Use ERR_CAST
  ceph: renew auth tickets before they expire
  ceph: do not resend mon requests on auth ticket renewal
  ceph: removed duplicated #includes
  ceph: avoid possible null dereference
  ceph: make mds requests killable, not interruptible
  sched: add wait_for_completion_killable_timeout
parents 52b0ace7 2a8e5e36

fs/ceph/auth.c

+3 −4
Original line number Diff line number Diff line 
#include "ceph_debug.h"



#include <linux/module.h>

#include <linux/slab.h>

#include <linux/err.h>

#include <linux/slab.h>
@@ -217,8 +216,8 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac, 
		if (ac->protocol != protocol) {

			ret = ceph_auth_init_protocol(ac, protocol);

			if (ret) {

				pr_err("error %d on auth method %s init\n",

				       ret, ac->ops->name);

				pr_err("error %d on auth protocol %d init\n",

				       ret, protocol);

				goto out;

			}

		}
@@ -247,7 +246,7 @@ int ceph_build_auth(struct ceph_auth_client *ac, 
	if (!ac->protocol)

		return ceph_auth_build_hello(ac, msg_buf, msg_len);

	BUG_ON(!ac->ops);

	if (!ac->ops->is_authenticated(ac))

	if (ac->ops->should_authenticate(ac))

		return ceph_build_auth_request(ac, msg_buf, msg_len);

	return 0;

}

fs/ceph/auth.h

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ struct ceph_auth_client_ops { 
	 */

	int (*is_authenticated)(struct ceph_auth_client *ac);



	/*

	 * true if we should (re)authenticate, e.g., when our tickets

	 * are getting old and crusty.

	 */

	int (*should_authenticate)(struct ceph_auth_client *ac);



	/*

	 * build requests and process replies during monitor

	 * handshake.  if handle_reply returns -EAGAIN, we build

fs/ceph/auth_none.c

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ static int is_authenticated(struct ceph_auth_client *ac) 
	return !xi->starting;

}



static int should_authenticate(struct ceph_auth_client *ac)

{

	struct ceph_auth_none_info *xi = ac->private;



	return xi->starting;

}



/*

 * the generic auth code decode the global_id, and we carry no actual

 * authenticate state, so nothing happens here.
@@ -98,6 +105,7 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = { 
	.reset = reset,

	.destroy = destroy,

	.is_authenticated = is_authenticated,

	.should_authenticate = should_authenticate,

	.handle_reply = handle_reply,

	.create_authorizer = ceph_auth_none_create_authorizer,

	.destroy_authorizer = ceph_auth_none_destroy_authorizer,

fs/ceph/auth_x.c

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,17 @@ static int ceph_x_is_authenticated(struct ceph_auth_client *ac) 
	return (ac->want_keys & xi->have_keys) == ac->want_keys;

}



static int ceph_x_should_authenticate(struct ceph_auth_client *ac)

{

	struct ceph_x_info *xi = ac->private;

	int need;



	ceph_x_validate_tickets(ac, &need);

	dout("ceph_x_should_authenticate want=%d need=%d have=%d\n",

	     ac->want_keys, need, xi->have_keys);

	return need != 0;

}



static int ceph_x_encrypt_buflen(int ilen)

{

	return sizeof(struct ceph_x_encrypt_header) + ilen + 16 +
@@ -620,6 +631,7 @@ static void ceph_x_invalidate_authorizer(struct ceph_auth_client *ac, 
static const struct ceph_auth_client_ops ceph_x_ops = {

	.name = "x",

	.is_authenticated = ceph_x_is_authenticated,

	.should_authenticate = ceph_x_should_authenticate,

	.build_request = ceph_x_build_request,

	.handle_reply = ceph_x_handle_reply,

	.create_authorizer = ceph_x_create_authorizer,

fs/ceph/ceph_fs.h

+11 −10
Original line number Diff line number Diff line
@@ -265,16 +265,17 @@ extern const char *ceph_mds_state_name(int s); 
 *  - they also define the lock ordering by the MDS

 *  - a few of these are internal to the mds

 */

#define CEPH_LOCK_DN          1

#define CEPH_LOCK_ISNAP       2

#define CEPH_LOCK_IVERSION    4     /* mds internal */

#define CEPH_LOCK_IFILE       8     /* mds internal */

#define CEPH_LOCK_IAUTH       32

#define CEPH_LOCK_ILINK       64

#define CEPH_LOCK_IDFT        128   /* dir frag tree */

#define CEPH_LOCK_INEST       256   /* mds internal */

#define CEPH_LOCK_IXATTR      512

#define CEPH_LOCK_INO         2048  /* immutable inode bits; not a lock */

#define CEPH_LOCK_DVERSION    1

#define CEPH_LOCK_DN          2

#define CEPH_LOCK_ISNAP       16

#define CEPH_LOCK_IVERSION    32    /* mds internal */

#define CEPH_LOCK_IFILE       64

#define CEPH_LOCK_IAUTH       128

#define CEPH_LOCK_ILINK       256

#define CEPH_LOCK_IDFT        512   /* dir frag tree */

#define CEPH_LOCK_INEST       1024  /* mds internal */

#define CEPH_LOCK_IXATTR      2048

#define CEPH_LOCK_INO         8192  /* immutable inode bits; not a lock */



/* client_session ops */

enum {

CRA Git | Maintained and supported by SUSTech CRA and CCSE