Commit 1a68aefc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:
 "This round it contains only three small cleanup patches"

* tag 'for-linus-6.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  drivers/xen: use min() instead of min_t()
  drivers/xen/xenbus: Replace deprecated strcpy in xenbus_transaction_end
  drivers/xen/xenbus: Simplify return statement in join()
parents 249872f5 150215b8

drivers/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ void gnttab_foreach_grant_in_range(struct page *page, 
	unsigned int glen;

	unsigned long xen_pfn;



	len = min_t(unsigned int, PAGE_SIZE - offset, len);

	len = min(PAGE_SIZE - offset, len);

	goffset = xen_offset_in_page(offset);



	xen_pfn = page_to_xen_pfn(page) + XEN_PFN_DOWN(offset);

drivers/xen/xenbus/xenbus_xs.c

+5 −11
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static char *join(const char *dir, const char *name) 
		buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s", dir);

	else

		buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s/%s", dir, name);

	return (!buffer) ? ERR_PTR(-ENOMEM) : buffer;

	return buffer ?: ERR_PTR(-ENOMEM);

}



static char **split_strings(char *strings, unsigned int len, unsigned int *num)
@@ -546,18 +546,12 @@ int xenbus_transaction_start(struct xenbus_transaction *t) 
EXPORT_SYMBOL_GPL(xenbus_transaction_start);



/* End a transaction.

 * If abandon is true, transaction is discarded instead of committed.

 * If abort is true, transaction is discarded instead of committed.

 */

int xenbus_transaction_end(struct xenbus_transaction t, int abort)

int xenbus_transaction_end(struct xenbus_transaction t, bool abort)

{

	char abortstr[2];



	if (abort)

		strcpy(abortstr, "F");

	else

		strcpy(abortstr, "T");



	return xs_error(xs_single(t, XS_TRANSACTION_END, abortstr, NULL));

	return xs_error(xs_single(t, XS_TRANSACTION_END, abort ? "F" : "T",

				  NULL));

}

EXPORT_SYMBOL_GPL(xenbus_transaction_end);

include/xen/xenbus.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int xenbus_exists(struct xenbus_transaction t, 
		  const char *dir, const char *node);

int xenbus_rm(struct xenbus_transaction t, const char *dir, const char *node);

int xenbus_transaction_start(struct xenbus_transaction *t);

int xenbus_transaction_end(struct xenbus_transaction t, int abort);

int xenbus_transaction_end(struct xenbus_transaction t, bool abort);



/* Single read and scanf: returns -errno or num scanned if > 0. */

__scanf(4, 5)