Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen: update pvcalls_front_accept prototype

While currently there are no in-tree callers of these functions, it is
best to keep them up-to-date with the latest network API.

In addition, add the missing EXPORT_SYMBOL_GPL to the functions listed
in pvcalls-front.h.

Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Message-ID: <alpine.DEB.2.22.394.2501201537560.11086@ubuntu-linux-20-04-desktop>
Signed-off-by: Juergen Gross <jgross@suse.com>

authored by

Stefano Stabellini and committed by
Juergen Gross
bda50f77 6d002348

+13 -3
+12 -2
drivers/xen/pvcalls-front.c
··· 341 341 pvcalls_exit(); 342 342 return ret; 343 343 } 344 + EXPORT_SYMBOL_GPL(pvcalls_front_socket); 344 345 345 346 static void free_active_ring(struct sock_mapping *map) 346 347 { ··· 487 486 pvcalls_exit_sock(sock); 488 487 return ret; 489 488 } 489 + EXPORT_SYMBOL_GPL(pvcalls_front_connect); 490 490 491 491 static int __write_ring(struct pvcalls_data_intf *intf, 492 492 struct pvcalls_data *data, ··· 583 581 pvcalls_exit_sock(sock); 584 582 return tot_sent; 585 583 } 584 + EXPORT_SYMBOL_GPL(pvcalls_front_sendmsg); 586 585 587 586 static int __read_ring(struct pvcalls_data_intf *intf, 588 587 struct pvcalls_data *data, ··· 669 666 pvcalls_exit_sock(sock); 670 667 return ret; 671 668 } 669 + EXPORT_SYMBOL_GPL(pvcalls_front_recvmsg); 672 670 673 671 int pvcalls_front_bind(struct socket *sock, struct sockaddr *addr, int addr_len) 674 672 { ··· 723 719 pvcalls_exit_sock(sock); 724 720 return 0; 725 721 } 722 + EXPORT_SYMBOL_GPL(pvcalls_front_bind); 726 723 727 724 int pvcalls_front_listen(struct socket *sock, int backlog) 728 725 { ··· 773 768 pvcalls_exit_sock(sock); 774 769 return ret; 775 770 } 771 + EXPORT_SYMBOL_GPL(pvcalls_front_listen); 776 772 777 - int pvcalls_front_accept(struct socket *sock, struct socket *newsock, int flags) 773 + int pvcalls_front_accept(struct socket *sock, struct socket *newsock, 774 + struct proto_accept_arg *arg) 778 775 { 779 776 struct pvcalls_bedata *bedata; 780 777 struct sock_mapping *map; ··· 795 788 return -EINVAL; 796 789 } 797 790 798 - nonblock = flags & SOCK_NONBLOCK; 791 + nonblock = arg->flags & SOCK_NONBLOCK; 799 792 /* 800 793 * Backend only supports 1 inflight accept request, will return 801 794 * errors for the others ··· 911 904 pvcalls_exit_sock(sock); 912 905 return ret; 913 906 } 907 + EXPORT_SYMBOL_GPL(pvcalls_front_accept); 914 908 915 909 static __poll_t pvcalls_front_poll_passive(struct file *file, 916 910 struct pvcalls_bedata *bedata, ··· 1012 1004 pvcalls_exit_sock(sock); 1013 1005 return ret; 1014 1006 } 1007 + EXPORT_SYMBOL_GPL(pvcalls_front_poll); 1015 1008 1016 1009 int pvcalls_front_release(struct socket *sock) 1017 1010 { ··· 1096 1087 pvcalls_exit(); 1097 1088 return 0; 1098 1089 } 1090 + EXPORT_SYMBOL_GPL(pvcalls_front_release); 1099 1091 1100 1092 static const struct xenbus_device_id pvcalls_front_ids[] = { 1101 1093 { "pvcalls" },
+1 -1
drivers/xen/pvcalls-front.h
··· 12 12 int pvcalls_front_listen(struct socket *sock, int backlog); 13 13 int pvcalls_front_accept(struct socket *sock, 14 14 struct socket *newsock, 15 - int flags); 15 + struct proto_accept_arg *arg); 16 16 int pvcalls_front_sendmsg(struct socket *sock, 17 17 struct msghdr *msg, 18 18 size_t len);