Commit d52ac3f2 authored by Mariusz Ziulek's avatar Mariusz Ziulek Committed by Greg Kroah-Hartman
Browse files

staging: dst: fix coding style 



Signed-off-by: default avatarMariusz Ziulek <mz.mzet@gmail.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f5e08ca7

drivers/staging/dst/crypto.c

+33 −31
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static struct crypto_hash *dst_init_hash(struct dst_crypto_ctl *ctl, u8 *key) 
	return ERR_PTR(err);

}



static struct crypto_ablkcipher *dst_init_cipher(struct dst_crypto_ctl *ctl, u8 *key)

static struct crypto_ablkcipher *dst_init_cipher(struct dst_crypto_ctl *ctl,

		u8 *key)

{

	int err = -EINVAL;

	struct crypto_ablkcipher *cipher;
@@ -139,7 +140,8 @@ static int dst_crypto_pages_alloc(struct dst_crypto_engine *e, int num) 
 * Initialize crypto engine for given node.

 * Setup cipher/hash, keys, pool of threads and private data.

 */

static int dst_crypto_engine_init(struct dst_crypto_engine *e, struct dst_node *n)

static int dst_crypto_engine_init(struct dst_crypto_engine *e,

		struct dst_node *n)

{

	int err;

	struct dst_crypto_ctl *ctl = &n->crypto;
@@ -198,8 +200,7 @@ static void dst_crypto_engine_exit(struct dst_crypto_engine *e) 
/*

 * Waiting for cipher processing to be completed.

 */

struct dst_crypto_completion

{

struct dst_crypto_completion {

	struct completion		complete;

	int				error;

};
@@ -411,9 +412,9 @@ static void dst_crypto_thread_cleanup(void *private) 
 * Initialize crypto engine for given node: store keys, create pool

 * of threads, initialize each one.

 *

 * Each thread has unique ID, but 0 and 1 are reserved for receiving and accepting

 * threads (if export node), so IDs could start from 2, but starting them

 * from 10 allows easily understand what this thread is for.

 * Each thread has unique ID, but 0 and 1 are reserved for receiving and

 * accepting threads (if export node), so IDs could start from 2, but starting

 * them from 10 allows easily understand what this thread is for.

 */

int dst_node_crypto_init(struct dst_node *n, struct dst_crypto_ctl *ctl)

{
@@ -497,7 +498,7 @@ static void dst_dump_bio(struct bio *bio) 


		p = kmap(bv->bv_page) + bv->bv_offset;

		for (i = 0; i < bv->bv_len; ++i)

			printk("%02x ", p[i]);

			printk(KERN_DEBUG "%02x ", p[i]);

		kunmap(bv->bv_page);

		printk("\n");

	}
@@ -572,9 +573,9 @@ static int dst_crypto_process_receiving(struct dst_crypto_engine *e, 
			unsigned int i;



			printk(", recv/calc: ");

			for (i=0; i<crypto_hash_digestsize(e->hash); ++i) {

			for (i = 0; i < crypto_hash_digestsize(e->hash); ++i)

				printk("%02x/%02x ", recv_hash[i], hash[i]);

			}



		}

		printk("\n");

#endif
@@ -680,8 +681,9 @@ static int dst_export_crypto_action(void *crypto_engine, void *schedule_data) 
	struct dst_export_priv *p = bio->bi_private;

	int err;



	dprintk("%s: e: %p, data: %p, bio: %llu/%u, dir: %lu.\n", __func__,

		e, e->data, (u64)bio->bi_sector, bio->bi_size, bio_data_dir(bio));

	dprintk("%s: e: %p, data: %p, bio: %llu/%u, dir: %lu.\n",

			__func__, e, e->data, (u64)bio->bi_sector,

			bio->bi_size, bio_data_dir(bio));



	e->enc = (bio_data_dir(bio) == READ);

	e->iv = p->cmd.id;

drivers/staging/dst/dcore.c

+15 −11
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int dst_request(struct request_queue *q, struct bio *bio) 
		 * bio_rw_flagged(bio, BIO_RW_DISCARD) only, which does not

		 * work in this case.

		 */

		//err = -EOPNOTSUPP;

		/* err = -EOPNOTSUPP; */

		err = 0;

		goto end_io;

	}
@@ -197,7 +197,8 @@ static int dst_node_create_disk(struct dst_node *n) 
	n->disk->fops = &dst_blk_ops;

	n->disk->queue = n->queue;

	n->disk->private_data = n;

	snprintf(n->disk->disk_name, sizeof(n->disk->disk_name), "dst-%s", n->name);

	snprintf(n->disk->disk_name, sizeof(n->disk->disk_name),

			"dst-%s", n->name);



	return 0;
@@ -246,7 +247,8 @@ static ssize_t dst_show_type(struct device *dev, 
		return sprintf(buf, "%u.%u.%u.%u:%d\n",

			NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));

	} else if (family == AF_INET6) {

		struct sockaddr_in6 *sin = (struct sockaddr_in6 *)&info->net.addr;

		struct sockaddr_in6 *sin = (struct sockaddr_in6 *)

				&info->net.addr;

		return sprintf(buf,

			"%pi6:%d\n",

			&sin->sin6_addr, ntohs(sin->sin6_port));
@@ -358,7 +360,7 @@ static int dst_node_sysfs_init(struct dst_node *n) 
 */

static inline unsigned int dst_hash(char *str, unsigned int size)

{

	return (jhash(str, size, 0) % dst_hashtable_size);

	return jhash(str, size, 0) % dst_hashtable_size;

}



static void dst_node_remove(struct dst_node *n)
@@ -641,7 +643,8 @@ static int dst_start_remote(struct dst_node *n) 
	dst_node_set_size(n);

	add_disk(n->disk);



	dprintk("DST: started remote node '%s', minor: %d.\n", n->name, n->disk->first_minor);

	dprintk("DST: started remote node '%s', minor: %d.\n",

			n->name, n->disk->first_minor);



	return 0;

}
@@ -740,7 +743,8 @@ static int dst_node_remove_unload(struct dst_node *n) 
	 * counter will be equal to 1),

	 * and subsequent dst_node_put() calls will free the node.

	 */

	dprintk("%s: going to sleep with %d refcnt.\n", __func__, atomic_read(&n->refcnt));

	dprintk("%s: going to sleep with %d refcnt.\n",

			__func__, atomic_read(&n->refcnt));

	wait_event(n->wait, atomic_read(&n->refcnt) <= 2);



	dst_node_put(n);

drivers/staging/dst/export.c

+17 −14
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ void dst_export_exit(void) 
 * its permissions are checked in a security attributes and sent

 * back.

 */

static unsigned int dst_check_permissions(struct dst_state *main, struct dst_state *st)

static unsigned int dst_check_permissions(struct dst_state *main,

		struct dst_state *st)

{

	struct dst_node *n = main->node;

	struct dst_secure *sentry;
@@ -73,9 +74,9 @@ static unsigned int dst_check_permissions(struct dst_state *main, struct dst_sta 


		/*

		 * This '2' below is a port field. This may be very wrong to do

		 * in atalk for example though. If there will be any need to extent

		 * protocol to something else, I can create per-family helpers and

		 * use them instead of this memcmp.

		 * in atalk for example though. If there will be any need

		 * to extent protocol to something else, I can create

		 * per-family helpers and use them instead of this memcmp.

		 */

		if (memcmp(s->addr.sa_data + 2, sa->sa_data + 2,

					sa->sa_data_len - 2))
@@ -125,8 +126,8 @@ static struct dst_state *dst_accept_client(struct dst_state *st) 
				 * Magic HZ? Polling check above is not safe in

				 * all cases (like socket reset in BH context),

				 * so it is simpler just to postpone it to the

				 * process context instead of implementing special

				 * locking there.

				 * process context instead of implementing

				 * special locking there.

				 */

				schedule_timeout(HZ);

			}
@@ -272,8 +273,8 @@ static void dst_state_cleanup_export(struct dst_state *st) 
			if (p)

				bio_put(p->bio);



			dprintk("%s: st: %p, refcnt: %d, list_empty: %d, p: %p.\n",

				__func__, st, atomic_read(&st->refcnt),

			dprintk("%s: st: %p, refcnt: %d, list_empty: %d, p: "

				"%p.\n", __func__, st, atomic_read(&st->refcnt),

				list_empty(&st->request_list), p);

		}

	}
@@ -341,8 +342,9 @@ static int dst_accept(void *init_data, void *schedule_data) 
int dst_start_export(struct dst_node *n)

{

	if (list_empty(&n->security_list)) {

		printk(KERN_ERR "You are trying to export node '%s' without security attributes.\n"

				"No clients will be allowed to connect. Exiting.\n", n->name);

		printk(KERN_ERR "You are trying to export node '%s' "

				"without security attributes.\nNo clients will "

				"be allowed to connect. Exiting.\n", n->name);

		return -EINVAL;

	}

	return dst_node_trans_init(n, sizeof(struct dst_export_priv));
@@ -552,7 +554,8 @@ int dst_process_io(struct dst_state *st) 
	if (!bio)

		goto err_out_exit;



	priv = (struct dst_export_priv *)(((void *)bio) - sizeof (struct dst_export_priv));

	priv = (struct dst_export_priv *)(((void *)bio) -

			sizeof (struct dst_export_priv));



	priv->state = dst_state_get(st);

	priv->bio = bio;

drivers/staging/dst/state.c

+39 −34
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ 
 * Polling machinery.

 */



struct dst_poll_helper

{

struct dst_poll_helper {

	poll_table		pt;

	struct dst_state	*st;

};



static int dst_queue_wake(wait_queue_t *wait, unsigned mode, int sync, void *key)

static int dst_queue_wake(wait_queue_t *wait, unsigned mode,

		int sync, void *key)

{

	struct dst_state *st = container_of(wait, struct dst_state, wait);
@@ -217,8 +217,8 @@ void dst_dump_addr(struct socket *sk, struct sockaddr *sa, char *str) 
{

	if (sk->ops->family == AF_INET) {

		struct sockaddr_in *sin = (struct sockaddr_in *)sa;

		printk(KERN_INFO "%s %u.%u.%u.%u:%d.\n",

			str, NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));

		printk(KERN_INFO "%s %u.%u.%u.%u:%d.\n", str,

			NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));

	} else if (sk->ops->family == AF_INET6) {

		struct sockaddr_in6 *sin = (struct sockaddr_in6 *)sa;

		printk(KERN_INFO "%s %pi6:%d",
@@ -271,13 +271,13 @@ static int dst_state_init_connected(struct dst_state *st) 
 * State reset is used to reconnect to the remote peer.

 * May fail, but who cares, we will try again later.

 */

static void inline dst_state_reset_nolock(struct dst_state *st)

static inline void dst_state_reset_nolock(struct dst_state *st)

{

	dst_state_exit_connected(st);

	dst_state_init_connected(st);

}



static void inline dst_state_reset(struct dst_state *st)

static inline void dst_state_reset(struct dst_state *st)

{

	dst_state_lock(st);

	dst_state_reset_nolock(st);
@@ -335,9 +335,11 @@ static int dst_send_ping(struct dst_state *st) 


		cmd->cmd = __cpu_to_be32(DST_PING);



		err = dst_data_send_header(st->socket, cmd, sizeof(struct dst_cmd), 0);

		err = dst_data_send_header(st->socket, cmd,

				sizeof(struct dst_cmd), 0);

	}

	dprintk("%s: st: %p, socket: %p, err: %d.\n", __func__, st, st->socket, err);

	dprintk("%s: st: %p, socket: %p, err: %d.\n", __func__,

			st, st->socket, err);

	dst_state_unlock(st);



	return err;
@@ -390,8 +392,7 @@ int dst_data_recv(struct dst_state *st, void *data, unsigned int size) 
		err = -ECONNRESET;

		dst_state_lock(st);



		if (		st->socket &&

				(st->read_socket == st->socket) &&

		if (st->socket && (st->read_socket == st->socket) &&

				(revents & POLLIN)) {

			err = dst_data_recv_raw(st, data, size);

			if (err > 0) {
@@ -402,8 +403,9 @@ int dst_data_recv(struct dst_state *st, void *data, unsigned int size) 
		}



		if (revents & err_mask || !st->socket) {

			dprintk("%s: revents: %x, socket: %p, size: %u, err: %d.\n",

					__func__, revents, st->socket, size, err);

			dprintk("%s: revents: %x, socket: %p, size: %u, "

					"err: %d.\n", __func__, revents,

					st->socket, size, err);

			err = -ECONNRESET;

		}
@@ -440,7 +442,8 @@ static int dst_process_cfg(struct dst_state *st) 
/*

 * Receive block IO from the network.

 */

static int dst_recv_bio(struct dst_state *st, struct bio *bio, unsigned int total_size)

static int dst_recv_bio(struct dst_state *st, struct bio *bio,

		unsigned int total_size)

{

	struct bio_vec *bv;

	int i, err;
@@ -450,9 +453,10 @@ static int dst_recv_bio(struct dst_state *st, struct bio *bio, unsigned int tota 
	bio_for_each_segment(bv, bio, i) {

		sz = min(total_size, bv->bv_len);



		dprintk("%s: bio: %llu/%u, total: %u, len: %u, sz: %u, off: %u.\n",

			__func__, (u64)bio->bi_sector, bio->bi_size, total_size,

			bv->bv_len, sz, bv->bv_offset);

		dprintk("%s: bio: %llu/%u, total: %u, len: %u, sz: %u, "

				"off: %u.\n", __func__, (u64)bio->bi_sector,

				bio->bi_size, total_size, bv->bv_len, sz,

				bv->bv_offset);



		data = kmap(bv->bv_page) + bv->bv_offset;

		err = dst_data_recv(st, data, sz);
@@ -590,7 +594,8 @@ static int dst_recv_processing(struct dst_state *st) 
			cmd->flags, cmd->rw);



	/*

	 * This should catch protocol breakage and random garbage instead of commands.

	 * This should catch protocol breakage and random garbage

	 * instead of commands.

	 */

	if (unlikely(cmd->csize > st->size - sizeof(struct dst_cmd))) {

		err = -EBADMSG;

drivers/staging/dst/thread_pool.c

+21 −18
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
 * When action is being performed, thread can not be used by other users,

 * instead they will sleep until there is free thread to pick their work.

 */

struct thread_pool_worker

{

struct thread_pool_worker {

	struct list_head	worker_entry;



	struct task_struct	*thread;
@@ -116,10 +115,12 @@ void thread_pool_del_worker(struct thread_pool *p) 
	struct thread_pool_worker *w = NULL;



	while (!w && p->thread_num) {

		wait_event(p->wait, !list_empty(&p->ready_list) || !p->thread_num);

		wait_event(p->wait, !list_empty(&p->ready_list) ||

				!p->thread_num);



		dprintk("%s: locking list_empty: %d, thread_num: %d.\n",

				__func__, list_empty(&p->ready_list), p->thread_num);

				__func__, list_empty(&p->ready_list),

				p->thread_num);



		mutex_lock(&p->thread_lock);

		if (!list_empty(&p->ready_list)) {
@@ -127,8 +128,9 @@ void thread_pool_del_worker(struct thread_pool *p) 
					struct thread_pool_worker,

					worker_entry);



			dprintk("%s: deleting w: %p, thread_num: %d, list: %p [%p.%p].\n",

					__func__, w, p->thread_num, &p->ready_list,

			dprintk("%s: deleting w: %p, thread_num: %d, "

					"list: %p [%p.%p].\n", __func__,

					w, p->thread_num, &p->ready_list,

					p->ready_list.prev, p->ready_list.next);



			p->thread_num--;
@@ -321,7 +323,8 @@ int thread_pool_schedule_private(struct thread_pool *p, 
				w->has_data = 1;

				wake_up(&w->wait);

			} else {

				list_move_tail(&w->worker_entry, &p->ready_list);

				list_move_tail(&w->worker_entry,

						&p->ready_list);

			}



			break;