This batch merges the remaining LNet patches from the OpenSFS branch for the upstream client. Once merged the LNet code will be up to date with the latest production code. Only style issues are remaining. Still future patches being developed for LNet will be landed to the upstream client as soon as they are ready after extensive testing. Frank Zago (1): staging: lustre: add last missing sparse annotation __user James Nunez (1): staging: lustre: Correct missing newline James Simmons (3): staging: lustre: change test to asser in LNetGetId staging: lustre: rename proc_call_handler to lprocfs_call_handler staging: lustre: make LNet use lprocfs_call_handler Liang Zhen (2): staging: lustre: LNet drop rule implementation staging: lustre: LNet network latency simulation Sebastien Buisson (3): staging: lustre: fix 'data race condition' issue in conrpc.c staging: lustre: fix 'NULL pointer dereference' errors staging: lustre: fix 'data race condition' issue in framework.c .../staging/lustre/include/linux/libcfs/libcfs.h | 4 + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 1 + .../staging/lustre/include/linux/lnet/lib-lnet.h | 27 + .../staging/lustre/include/linux/lnet/lib-types.h | 5 + .../staging/lustre/include/linux/lnet/lnetctl.h | 100 ++ drivers/staging/lustre/lnet/lnet/Makefile | 2 +- drivers/staging/lustre/lnet/lnet/api-ni.c | 13 +- drivers/staging/lustre/lnet/lnet/lib-move.c | 83 +- drivers/staging/lustre/lnet/lnet/lib-msg.c | 6 + drivers/staging/lustre/lnet/lnet/net_fault.c | 1025 ++++++++++++++++++++ drivers/staging/lustre/lnet/lnet/router_proc.c | 32 +- drivers/staging/lustre/lnet/selftest/conctl.c | 49 +- drivers/staging/lustre/lnet/selftest/conrpc.c | 8 +- drivers/staging/lustre/lnet/selftest/framework.c | 9 +- drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- .../lustre/lustre/include/lustre/lustre_user.h | 3 + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 9 +- .../staging/lustre/lustre/libcfs/libcfs_string.c | 27 +- drivers/staging/lustre/lustre/libcfs/module.c | 25 +- drivers/staging/lustre/lustre/llite/file.c | 8 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +- drivers/staging/lustre/lustre/lov/lov_lock.c | 2 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 2 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 4 +- drivers/staging/lustre/lustre/lov/lov_request.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 3 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 11 +- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2 +- .../lustre/lustre/obdclass/lprocfs_status.c | 26 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 2 +- .../staging/lustre/lustre/obdecho/echo_client.c | 8 +- drivers/staging/lustre/lustre/osc/osc_cache.c | 9 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- drivers/staging/lustre/lustre/osc/osc_request.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 4 +- 37 files changed, 1380 insertions(+), 150 deletions(-) create mode 100644 drivers/staging/lustre/lnet/lnet/net_fault.c _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel