Commit 02d84ca5 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman
Browse files

Staging: pohmelfs: fix printk format warnings v2 



drivers/staging/pohmelfs/inode.c:917: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'size_t'
drivers/staging/pohmelfs/inode.c:1036: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
drivers/staging/pohmelfs/trans.c:164: warning: format '%u' expects type 'unsigned int', but argument 5 has type '__kernel_size_t'
drivers/staging/pohmelfs/trans.c:170: warning: format '%u' expects type 'unsigned int', but argument 7 has type '__kernel_size_t'
drivers/staging/pohmelfs/trans.c:517: warning: format '%u' expects type 'unsigned int', but argument 6 has type '__kernel_size_t'
drivers/staging/pohmelfs/trans.c:600: warning: format '%u' expects type 'unsigned int', but argument 6 has type '__kernel_size_t'
drivers/staging/pohmelfs/trans.c:610: warning: format '%u' expects type 'unsigned int', but argument 7 has type '__kernel_size_t'

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarFrank Seidel <frank@f-seidel.de>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 898a6cbe

drivers/staging/pohmelfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ ssize_t pohmelfs_write(struct file *file, const char __user *buf, 
	kiocb.ki_pos = pos;

	kiocb.ki_left = len;



	dprintk("%s: len: %u, pos: %llu.\n", __func__, len, pos);

	dprintk("%s: len: %zu, pos: %llu.\n", __func__, len, pos);



	mutex_lock(&inode->i_mutex);

	ret = pohmelfs_data_lock(pi, pos, len, POHMELFS_WRITE_LOCK);
@@ -1033,7 +1033,7 @@ static int pohmelfs_send_xattr_req(struct pohmelfs_inode *pi, u64 id, u64 start, 
	struct netfs_cmd *cmd;

	void *data;



	dprintk("%s: id: %llu, start: %llu, name: '%s', attrsize: %u, cmd: %d.\n",

	dprintk("%s: id: %llu, start: %llu, name: '%s', attrsize: %zu, cmd: %d.\n",

			__func__, id, start, name, attrsize, command);



	path_len = pohmelfs_path_length(pi);

drivers/staging/pohmelfs/trans.c

+5 −5
Original line number Diff line number Diff line
@@ -160,14 +160,14 @@ int netfs_trans_send(struct netfs_trans *t, struct netfs_state *st) 


	err = kernel_sendmsg(st->socket, &msg, (struct kvec *)msg.msg_iov, 1, t->iovec.iov_len);

	if (err <= 0) {

		printk("%s: failed to send contig transaction: t: %p, gen: %u, size: %u, err: %d.\n",

		printk("%s: failed to send contig transaction: t: %p, gen: %u, size: %zu, err: %d.\n",

				__func__, t, t->gen, t->iovec.iov_len, err);

		if (err == 0)

			err = -ECONNRESET;

		goto err_out_unlock_return;

	}



	dprintk("%s: sent %s transaction: t: %p, gen: %u, size: %u, page_num: %u.\n",

	dprintk("%s: sent %s transaction: t: %p, gen: %u, size: %zu, page_num: %u.\n",

			__func__, (t->page_num)?"partial":"full",

			t, t->gen, t->iovec.iov_len, t->page_num);
@@ -514,7 +514,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb) 
		cmd->csize = psb->crypto_attached_size;

	}



	dprintk("%s: t: %u, size: %u, iov_len: %u, attached_size: %u, attached_pages: %u.\n",

	dprintk("%s: t: %u, size: %u, iov_len: %zu, attached_size: %u, attached_pages: %u.\n",

			__func__, t->gen, cmd->size, t->iovec.iov_len, t->attached_size, t->attached_pages);

	err = pohmelfs_trans_crypt(t, psb);

	if (err) {
@@ -597,7 +597,7 @@ void *netfs_trans_add(struct netfs_trans *t, unsigned int size) 
	}



	if (io->iov_len + size > t->total_size) {

		dprintk("%s: too big size t: %p, gen: %u, iov_len: %u, size: %u, total: %u.\n",

		dprintk("%s: too big size t: %p, gen: %u, iov_len: %zu, size: %u, total: %u.\n",

				__func__, t, t->gen, io->iov_len, size, t->total_size);

		ptr = ERR_PTR(-E2BIG);

		goto out;
@@ -607,7 +607,7 @@ void *netfs_trans_add(struct netfs_trans *t, unsigned int size) 
	io->iov_len += size;



out:

	dprintk("%s: t: %p, gen: %u, size: %u, total: %u.\n",

	dprintk("%s: t: %p, gen: %u, size: %u, total: %zu.\n",

		__func__, t, t->gen, size, io->iov_len);

	return ptr;

}