From 3eeb821eff089e0f26f016a09ea1ee011fba3b4f Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Sun, 22 Jun 2014 21:32:05 -0400 Subject: [PATCH] staging/lustre/libcfs: revert changes to libcfs_sock_ioctl Changes introduced by 80db2734acbc78db12798cfb611d6acc7fe389e6 unfortunately totally break lustre, we use this function to access not only socket proto obs, but also device ioctl like SIOCGIFCONF that now fail. Reverting part of the previous patch to regain the needed functionality. Signed-off-by: Oleg Drokin CC: Fredrick John Berchmans Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/libcfs/linux/linux-tcpip.c | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c index a21b42687d8a..e52e33aab55b 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c @@ -46,16 +46,31 @@ int libcfs_sock_ioctl(int cmd, unsigned long arg) { + mm_segment_t oldmm = get_fs(); struct socket *sock; - int rc; + int rc; + struct file *sock_filp; rc = sock_create (PF_INET, SOCK_STREAM, 0, &sock); if (rc != 0) { CERROR ("Can't create socket: %d\n", rc); return rc; } - rc = kernel_sock_ioctl(sock, cmd, arg); - sock_release(sock); + + sock_filp = sock_alloc_file(sock, 0, NULL); + if (IS_ERR(sock_filp)) { + sock_release(sock); + rc = PTR_ERR(sock_filp); + goto out; + } + + set_fs(KERNEL_DS); + if (sock_filp->f_op->unlocked_ioctl) + rc = sock_filp->f_op->unlocked_ioctl(sock_filp, cmd, arg); + set_fs(oldmm); + + fput(sock_filp); +out: return rc; } -- 2.34.1