Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1715850 > unrolled thread
| Started by | James Simmons <jsimmons@infradead.org> |
|---|---|
| First post | 2017-08-20 04:50 +0200 |
| Last post | 2017-08-20 04:50 +0200 |
| Articles | 4 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 00/64 v2] staging: lustre: uapi: normalize the lustre headers James Simmons <jsimmons@infradead.org> - 2017-08-20 04:50 +0200
[PATCH 07/64 v2] staging: lustre: uapi: remove userland version of obd_ioctl_*() James Simmons <jsimmons@infradead.org> - 2017-08-20 04:50 +0200
[PATCH 04/64 v2] staging: lustre: uapi: update URL doc link in lustre_fid.h James Simmons <jsimmons@infradead.org> - 2017-08-20 04:50 +0200
[PATCH 09/64 v2] staging: lustre: uapi: remove obd_ioctl_popdata() wrapper James Simmons <jsimmons@infradead.org> - 2017-08-20 04:50 +0200
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Date | 2017-08-20 04:50 +0200 |
| Subject | [PATCH 00/64 v2] staging: lustre: uapi: normalize the lustre headers |
| Message-ID | <ugo9X-XA-3@gated-at.bofh.it> |
The headers for lustre/LNet for a long time lacked a clean separation in
its internal headers which resulted in kernel specific data structures
being exposed in user land code. This work unravels this mess and creates
a clear separation between lustre kernel space and lustre user land.
With this work done the include paths in the lustre kernel code can now
be normalized. This is the second version of the patch series which
includes a fix to include lustre_errno.h in the header lustre_net.h.
For some reason this only showed up on ia64 platforms but should be
resolved now. Second change was to add errno.h into lustre_ostid.h.
It is needed to handle the error codes returned for both user land
and kernel space.
Ben Evans (4):
staging: lustre: uapi: Move functions out of lustre_idl.h
staging: lustre: uapi: return error code for ostid_set_id
staging: lustre: uapi: update URL doc link in lustre_fid.h
staging: lustre: uapi: move lu_fid, ost_id funcs out of lustre_idl.h
James Simmons (60):
staging: lustre: uapi: remove unused functions for lustre_fid.h
staging: lustre: uapi: remove unused function in lustre_disk.h
staging: lustre: uapi: remove userland version of obd_ioctl_*()
staging: lustre: uapi: remove obd_ioctl_freedata() wrapper
staging: lustre: uapi: remove obd_ioctl_popdata() wrapper
staging: lustre: uapi: move obd_ioctl_getdata() declaration
staging: lustre: uapi: move obd_ioctl_is_invalid() to linux-module.c
staging: lustre: uapi: move lustre_ioctl.h to uapi directory
staging: lustre: uapi: use __ALIGN_KERNEL for lustre_ioctl.h
staging: lustre: uapi: cleanup headers for lustre_ioctl.h
staging: lustre: uapi: label lustre_ioctl.h as a UAPI header
staging: lustre: uapi: move kernel only prototypes out of lustre_param.h
staging: lustre: uapi: remove included headers out of lustre_param.h
staging: lustre: uapi: move lustre_param.h to uapi directory
staging: lustre: uapi: label lustre_param.h as an uapi header
staging: lustre: uapi: style cleanups for lustre_param.h
staging: lustre: uapi: remove lustre_cfg_free wrapper
staging: lustre: uapi: don't memory allocate in UAPI header
staging: lustre: uapi: move lustre_cfg_string() to obd_config.c
staging: lustre: obdclass: no need to check for kfree
staging: lustre: uapi: move lustre_cfg.h to uapi directory
staging: lustre: uapi: remove need for libcfs.h from lustre_cfg.h
staging: lustre: uapi: change variable type to match
staging: lustre: uapi: check if argument for lustre_cfg_buf() is NULL
staging: lustre: uapi: style cleanup of lustre_cfg.h
staging: lustre: uapi: label lustre_cfg.h as an uapi header
staging: lustre: libcfs: remove htonl hack in libcfs.h
staging: lustre: libcfs: remove LOGL and LOGU macros
staging: lustre: libcfs: create libcfs_debug.h UAPI header
staging: lustre: socklnd: create socklnd.h UAPI header
staging: lustre: lnet: delete lnet.h
staging: lustre: lnet: migrate headers to lnet uapi directory
staging: lustre: libcfs: sort headers in libcfs.h
staging: lustre: lnet: remove userland function prototype in lnetctl.h
staging: lustre: lnet: remove BIT macro from lnetctl.h
staging: lustre: uapi: remove libcfs.h from lustre_id.h/lustre_user.h
staging: lustre: uapi: migrate remaining uapi headers to uapi directory
staging: lustre: uapi: remove CONFIG_LUSTRE_OBD_MAX_IOCTL
staging: lustre: uapi: use proper byteorder functions in lustre_idl.h
staging: lustre: uapi: remove BIT macro from UAPI headers
staging: lustre: fid: add include path to Makefile
staging: lustre: fld: add include path to Makefile
staging: lustre: ptlrpc: add include path to Makefile
staging: lustre: llite: add include path to Makefile
staging: lustre: lmv: add include path to Makefile
staging: lustre: lov: add include path to Makefile
staging: lustre: mdc: add include path to Makefile
staging: lustre: mgc: add include path to Makefile
staging: lustre: obdclass: add include path to Makefile
staging: lustre: obdecho: add include path to Makefile
staging: lustre: osc: add include path to Makefile
staging: lustre: lustre: cleanup paths for lustre internal headers
staging: lustre: lustre: cleanup paths for lustre UAPI headers
staging: lustre: lnet: selftest: add include path to Makefile
staging: lustre: lnet: add include path to Makefile
staging: lustre: ko2iblnd: add include path to Makefile
staging: lustre: ksocklnd: add include path to Makefile
staging: lustre: libcfs: add include path to Makefile
staging: lustre: libcfs: cleanup paths for libcfs headers
staging: lustre: lnet: cleanup paths for all LNet headers
.../staging/lustre/include/linux/libcfs/libcfs.h | 28 +-
.../lustre/include/linux/libcfs/libcfs_debug.h | 104 +---
.../lustre/include/linux/libcfs/libcfs_private.h | 26 -
drivers/staging/lustre/include/linux/lnet/api.h | 2 +-
.../staging/lustre/include/linux/lnet/lib-lnet.h | 12 +-
.../staging/lustre/include/linux/lnet/lib-types.h | 4 +-
.../staging/lustre/include/linux/lnet/socklnd.h | 12 +-
.../lustre/include/uapi/linux/lnet/libcfs_debug.h | 149 +++++
.../libcfs => uapi/linux/lnet}/libcfs_ioctl.h | 0
.../lnet/lib-dlc.h => uapi/linux/lnet/lnet-dlc.h} | 4 +-
.../lnet/types.h => uapi/linux/lnet/lnet-types.h} | 0
.../lustre/include/{ => uapi}/linux/lnet/lnetctl.h | 51 +-
.../lustre/include/{ => uapi}/linux/lnet/lnetst.h | 0
.../lustre/include/{ => uapi}/linux/lnet/nidstr.h | 2 +-
.../lnet/lnet.h => uapi/linux/lnet/socklnd.h} | 24 +-
.../uapi/linux/lustre}/lustre_cfg.h | 188 +++---
.../lustre/include/uapi/linux/lustre/lustre_fid.h | 293 +++++++++
.../uapi/linux/lustre/lustre_fiemap.h} | 6 +-
.../uapi/linux}/lustre/lustre_idl.h | 682 +--------------------
.../uapi/linux}/lustre/lustre_ioctl.h | 203 +-----
.../uapi/linux/lustre/lustre_kernelcomm.h} | 6 +-
.../include/uapi/linux/lustre/lustre_ostid.h | 236 +++++++
.../include/uapi/linux/lustre/lustre_param.h | 94 +++
.../uapi/linux}/lustre/lustre_user.h | 15 +-
.../uapi/linux/lustre}/lustre_ver.h | 0
drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 3 +
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 5 +-
drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 3 +
.../staging/lustre/lnet/klnds/socklnd/socklnd.h | 7 +-
drivers/staging/lustre/lnet/libcfs/Makefile | 3 +
drivers/staging/lustre/lnet/libcfs/debug.c | 2 +-
drivers/staging/lustre/lnet/libcfs/fail.c | 2 +-
drivers/staging/lustre/lnet/libcfs/hash.c | 2 +-
drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 2 +-
drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 2 +-
drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 2 +-
drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 2 +-
.../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 2 +-
.../lustre/lnet/libcfs/linux/linux-crypto.c | 4 +-
.../lustre/lnet/libcfs/linux/linux-curproc.c | 2 +-
.../staging/lustre/lnet/libcfs/linux/linux-debug.c | 2 +-
.../staging/lustre/lnet/libcfs/linux/linux-mem.c | 2 +-
.../lustre/lnet/libcfs/linux/linux-module.c | 2 +-
.../staging/lustre/lnet/libcfs/linux/linux-prim.c | 2 +-
.../lustre/lnet/libcfs/linux/linux-tracefile.c | 2 +-
drivers/staging/lustre/lnet/libcfs/module.c | 9 +-
drivers/staging/lustre/lnet/libcfs/prng.c | 2 +-
drivers/staging/lustre/lnet/libcfs/tracefile.c | 2 +-
drivers/staging/lustre/lnet/libcfs/tracefile.h | 2 +-
drivers/staging/lustre/lnet/libcfs/workitem.c | 2 +-
drivers/staging/lustre/lnet/lnet/Makefile | 3 +
drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +-
drivers/staging/lustre/lnet/lnet/api-ni.c | 4 +-
drivers/staging/lustre/lnet/lnet/config.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +-
drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-me.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-move.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-msg.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +-
drivers/staging/lustre/lnet/lnet/lo.c | 3 +-
drivers/staging/lustre/lnet/lnet/module.c | 5 +-
drivers/staging/lustre/lnet/lnet/net_fault.c | 4 +-
drivers/staging/lustre/lnet/lnet/nidstrings.c | 4 +-
drivers/staging/lustre/lnet/lnet/peer.c | 4 +-
drivers/staging/lustre/lnet/lnet/router.c | 3 +-
drivers/staging/lustre/lnet/lnet/router_proc.c | 5 +-
drivers/staging/lustre/lnet/selftest/Makefile | 3 +
drivers/staging/lustre/lnet/selftest/conctl.c | 6 +-
drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +-
drivers/staging/lustre/lnet/selftest/conrpc.h | 7 +-
drivers/staging/lustre/lnet/selftest/console.c | 4 +-
drivers/staging/lustre/lnet/selftest/console.h | 7 +-
drivers/staging/lustre/lnet/selftest/rpc.h | 2 +-
drivers/staging/lustre/lnet/selftest/selftest.h | 9 +-
drivers/staging/lustre/lustre/Kconfig | 10 -
drivers/staging/lustre/lustre/fid/Makefile | 3 +
drivers/staging/lustre/lustre/fid/fid_internal.h | 4 +-
drivers/staging/lustre/lustre/fid/fid_lib.c | 5 +-
drivers/staging/lustre/lustre/fid/fid_request.c | 12 +-
drivers/staging/lustre/lustre/fid/lproc_fid.c | 12 +-
drivers/staging/lustre/lustre/fld/Makefile | 3 +
drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +-
drivers/staging/lustre/lustre/fld/fld_internal.h | 8 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 18 +-
drivers/staging/lustre/lustre/fld/lproc_fld.c | 14 +-
drivers/staging/lustre/lustre/include/cl_object.h | 4 +-
drivers/staging/lustre/lustre/include/llog_swab.h | 3 +-
.../staging/lustre/lustre/include/lprocfs_status.h | 6 +-
drivers/staging/lustre/lustre/include/lu_object.h | 6 +-
.../staging/lustre/lustre/include/lustre_compat.h | 2 +-
.../staging/lustre/lustre/include/lustre_debug.h | 4 +-
.../staging/lustre/lustre/include/lustre_disk.h | 23 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 25 +-
.../lustre/include/{lustre => }/lustre_errno.h | 0
.../staging/lustre/lustre/include/lustre_export.h | 6 +-
drivers/staging/lustre/lustre/include/lustre_fid.h | 84 ++-
drivers/staging/lustre/lustre/include/lustre_fld.h | 5 +-
.../staging/lustre/lustre/include/lustre_handles.h | 2 +-
.../staging/lustre/lustre/include/lustre_import.h | 4 +-
.../lustre/lustre/include/lustre_kernelcomm.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_lib.h | 12 +-
drivers/staging/lustre/lustre/include/lustre_lmv.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_log.h | 4 +-
drivers/staging/lustre/lustre/include/lustre_mdc.h | 15 +-
drivers/staging/lustre/lustre/include/lustre_mds.h | 11 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 29 +-
drivers/staging/lustre/lustre/include/lustre_nrs.h | 2 +-
.../staging/lustre/lustre/include/lustre_obdo.h | 2 +-
.../staging/lustre/lustre/include/lustre_param.h | 109 ----
.../staging/lustre/lustre/include/lustre_swab.h | 8 +-
drivers/staging/lustre/lustre/include/obd.h | 18 +-
drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +-
drivers/staging/lustre/lustre/include/obd_class.h | 35 +-
.../staging/lustre/lustre/include/obd_support.h | 6 +-
drivers/staging/lustre/lustre/include/seq_range.h | 2 +-
drivers/staging/lustre/lustre/ldlm/interval_tree.c | 6 +-
drivers/staging/lustre/lustre/ldlm/l_lock.c | 6 +-
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 12 +-
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 8 +-
.../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 6 +-
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 6 +
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 12 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 8 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 +-
drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 6 +-
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 +-
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 34 +-
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 6 +-
drivers/staging/lustre/lustre/llite/Makefile | 3 +
drivers/staging/lustre/lustre/llite/dcache.c | 6 +-
drivers/staging/lustre/lustre/llite/dir.c | 22 +-
drivers/staging/lustre/lustre/llite/file.c | 10 +-
drivers/staging/lustre/lustre/llite/glimpse.c | 16 +-
drivers/staging/lustre/lustre/llite/lcommon_cl.c | 35 +-
drivers/staging/lustre/lustre/llite/lcommon_misc.c | 8 +-
.../staging/lustre/lustre/llite/llite_internal.h | 20 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 21 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 +-
drivers/staging/lustre/lustre/llite/namei.c | 7 +-
drivers/staging/lustre/lustre/llite/range_lock.c | 2 +-
drivers/staging/lustre/lustre/llite/range_lock.h | 4 +-
drivers/staging/lustre/lustre/llite/rw.c | 2 +-
drivers/staging/lustre/lustre/llite/statahead.c | 4 +-
drivers/staging/lustre/lustre/llite/super25.c | 6 +-
drivers/staging/lustre/lustre/llite/vvp_dev.c | 2 +-
drivers/staging/lustre/lustre/llite/vvp_internal.h | 4 +-
drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +-
drivers/staging/lustre/lustre/llite/vvp_lock.c | 2 +-
drivers/staging/lustre/lustre/llite/vvp_object.c | 4 +-
drivers/staging/lustre/lustre/llite/xattr.c | 5 +-
drivers/staging/lustre/lustre/llite/xattr_cache.c | 5 +-
drivers/staging/lustre/lustre/lmv/Makefile | 3 +
drivers/staging/lustre/lustre/lmv/lmv_fld.c | 15 +-
drivers/staging/lustre/lustre/lmv/lmv_intent.c | 17 +-
drivers/staging/lustre/lustre/lmv/lmv_internal.h | 6 +-
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 19 +-
drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 4 +-
drivers/staging/lustre/lustre/lov/Makefile | 3 +
.../staging/lustre/lustre/lov/lov_cl_internal.h | 6 +-
drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +-
drivers/staging/lustre/lustre/lov/lov_ea.c | 6 +-
drivers/staging/lustre/lustre/lov/lov_internal.h | 4 +-
drivers/staging/lustre/lustre/lov/lov_merge.c | 4 +-
drivers/staging/lustre/lustre/lov/lov_obd.c | 40 +-
drivers/staging/lustre/lustre/lov/lov_offset.c | 4 +-
drivers/staging/lustre/lustre/lov/lov_pack.c | 13 +-
drivers/staging/lustre/lustre/lov/lov_pool.c | 4 +-
drivers/staging/lustre/lustre/lov/lov_request.c | 6 +-
drivers/staging/lustre/lustre/lov/lproc_lov.c | 4 +-
drivers/staging/lustre/lustre/mdc/Makefile | 3 +
drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 4 +-
drivers/staging/lustre/lustre/mdc/mdc_internal.h | 2 +-
drivers/staging/lustre/lustre/mdc/mdc_lib.c | 10 +-
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 22 +-
drivers/staging/lustre/lustre/mdc/mdc_reint.c | 4 +-
drivers/staging/lustre/lustre/mdc/mdc_request.c | 25 +-
drivers/staging/lustre/lustre/mgc/Makefile | 3 +
drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 4 +-
drivers/staging/lustre/lustre/mgc/mgc_internal.h | 11 +-
drivers/staging/lustre/lustre/mgc/mgc_request.c | 23 +-
drivers/staging/lustre/lustre/obdclass/Makefile | 3 +
drivers/staging/lustre/lustre/obdclass/cl_io.c | 8 +-
drivers/staging/lustre/lustre/obdclass/cl_lock.c | 8 +-
drivers/staging/lustre/lustre/obdclass/cl_object.c | 14 +-
drivers/staging/lustre/lustre/obdclass/cl_page.c | 8 +-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 35 +-
drivers/staging/lustre/lustre/obdclass/debug.c | 6 +-
drivers/staging/lustre/lustre/obdclass/genops.c | 6 +-
.../staging/lustre/lustre/obdclass/kernelcomm.c | 4 +-
drivers/staging/lustre/lustre/obdclass/linkea.c | 6 +-
.../lustre/lustre/obdclass/linux/linux-module.c | 100 ++-
.../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +-
drivers/staging/lustre/lustre/obdclass/llog.c | 6 +-
drivers/staging/lustre/lustre/obdclass/llog_cat.c | 2 +-
.../staging/lustre/lustre/obdclass/llog_internal.h | 2 +-
drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +-
drivers/staging/lustre/lustre/obdclass/llog_swab.c | 4 +-
.../lustre/lustre/obdclass/lprocfs_counters.c | 4 +-
.../lustre/lustre/obdclass/lprocfs_status.c | 6 +-
drivers/staging/lustre/lustre/obdclass/lu_object.c | 20 +-
drivers/staging/lustre/lustre/obdclass/lu_ref.c | 10 +-
.../lustre/lustre/obdclass/lustre_handles.c | 6 +-
.../staging/lustre/lustre/obdclass/lustre_peer.c | 14 +-
.../staging/lustre/lustre/obdclass/obd_config.c | 74 ++-
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 44 +-
drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +-
.../staging/lustre/lustre/obdclass/statfs_pack.c | 8 +-
drivers/staging/lustre/lustre/obdclass/uuid.c | 6 +-
drivers/staging/lustre/lustre/obdecho/Makefile | 3 +
.../staging/lustre/lustre/obdecho/echo_client.c | 31 +-
drivers/staging/lustre/lustre/osc/Makefile | 3 +
drivers/staging/lustre/lustre/osc/lproc_osc.c | 6 +-
.../staging/lustre/lustre/osc/osc_cl_internal.h | 6 +-
drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_internal.h | 2 +-
drivers/staging/lustre/lustre/osc/osc_io.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_lock.c | 4 +-
drivers/staging/lustre/lustre/osc/osc_object.c | 9 +-
drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_request.c | 32 +-
drivers/staging/lustre/lustre/ptlrpc/Makefile | 3 +
drivers/staging/lustre/lustre/ptlrpc/client.c | 12 +-
drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +-
drivers/staging/lustre/lustre/ptlrpc/errno.c | 4 +-
drivers/staging/lustre/lustre/ptlrpc/events.c | 8 +-
drivers/staging/lustre/lustre/ptlrpc/import.c | 16 +-
drivers/staging/lustre/lustre/ptlrpc/layout.c | 18 +-
drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 8 +-
drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 6 +-
.../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 12 +-
drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/nrs.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +-
.../staging/lustre/lustre/ptlrpc/pack_generic.c | 20 +-
drivers/staging/lustre/lustre/ptlrpc/pers.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 +-
.../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 8 +-
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 18 +-
drivers/staging/lustre/lustre/ptlrpc/recover.c | 18 +-
drivers/staging/lustre/lustre/ptlrpc/sec.c | 16 +-
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 20 +-
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 13 +-
drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 16 +-
drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 10 +-
drivers/staging/lustre/lustre/ptlrpc/service.c | 11 +-
drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 8 +-
250 files changed, 2091 insertions(+), 2182 deletions(-)
create mode 100644 drivers/staging/lustre/include/uapi/linux/lnet/libcfs_debug.h
rename drivers/staging/lustre/include/{linux/libcfs => uapi/linux/lnet}/libcfs_ioctl.h (100%)
rename drivers/staging/lustre/include/{linux/lnet/lib-dlc.h => uapi/linux/lnet/lnet-dlc.h} (97%)
rename drivers/staging/lustre/include/{linux/lnet/types.h => uapi/linux/lnet/lnet-types.h} (100%)
rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/lnetctl.h (62%)
rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/lnetst.h (100%)
rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/nidstr.h (98%)
rename drivers/staging/lustre/include/{linux/lnet/lnet.h => uapi/linux/lnet/socklnd.h} (70%)
rename drivers/staging/lustre/{lustre/include => include/uapi/linux/lustre}/lustre_cfg.h (52%)
create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h
rename drivers/staging/lustre/{lustre/include/lustre/ll_fiemap.h => include/uapi/linux/lustre/lustre_fiemap.h} (96%)
rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_idl.h (83%)
rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_ioctl.h (63%)
rename drivers/staging/lustre/{lustre/include/uapi_kernelcomm.h => include/uapi/linux/lustre/lustre_kernelcomm.h} (95%)
create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h
create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h
rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_user.h (99%)
rename drivers/staging/lustre/{lustre/include => include/uapi/linux/lustre}/lustre_ver.h (100%)
rename drivers/staging/lustre/lustre/include/{lustre => }/lustre_errno.h (100%)
delete mode 100644 drivers/staging/lustre/lustre/include/lustre_param.h
-----
Changelog)
1) Initial patch set submitted with lustre_errno.h build issues.
2) Include lustre_errno.h in the header lustre_net.h
Add <linux/errno.h> to lustre_ostid.h header.
--
1.8.3.1
[toc] | [next] | [standalone]
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Date | 2017-08-20 04:50 +0200 |
| Subject | [PATCH 07/64 v2] staging: lustre: uapi: remove userland version of obd_ioctl_*() |
| Message-ID | <ugotk-14b-9@gated-at.bofh.it> |
| In reply to | #1715850 |
The header lustre_ioctl.h has both kernel and user space versions
of obd_ioctl_*() functions. Lets remove the user land version
which have been integrated into the lustre tools.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/24568
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
.../lustre/lustre/include/lustre/lustre_ioctl.h | 87 ----------------------
1 file changed, 87 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
index eb08df3..84654af 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
@@ -208,8 +208,6 @@ static inline int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
return 0;
}
-#ifdef __KERNEL__
-
int obd_ioctl_getdata(char **buf, int *len, void __user *arg);
int obd_ioctl_popdata(void __user *arg, void *data, int len);
@@ -218,91 +216,6 @@ static inline void obd_ioctl_freedata(char *buf, size_t len)
kvfree(buf);
}
-#else /* __KERNEL__ */
-
-static inline int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf,
- int max_len)
-{
- char *ptr;
- struct obd_ioctl_data *overlay;
-
- data->ioc_len = obd_ioctl_packlen(data);
- data->ioc_version = OBD_IOCTL_VERSION;
-
- if (*pbuf && data->ioc_len > max_len) {
- fprintf(stderr, "pbuf = %p, ioc_len = %u, max_len = %d\n",
- *pbuf, data->ioc_len, max_len);
- return -EINVAL;
- }
-
- if (!*pbuf)
- *pbuf = malloc(data->ioc_len);
-
- if (!*pbuf)
- return -ENOMEM;
-
- overlay = (struct obd_ioctl_data *)*pbuf;
- memcpy(*pbuf, data, sizeof(*data));
-
- ptr = overlay->ioc_bulk;
- if (data->ioc_inlbuf1)
- LOGL(data->ioc_inlbuf1, data->ioc_inllen1, ptr);
-
- if (data->ioc_inlbuf2)
- LOGL(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
-
- if (data->ioc_inlbuf3)
- LOGL(data->ioc_inlbuf3, data->ioc_inllen3, ptr);
-
- if (data->ioc_inlbuf4)
- LOGL(data->ioc_inlbuf4, data->ioc_inllen4, ptr);
-
- if (obd_ioctl_is_invalid(overlay)) {
- fprintf(stderr, "invalid ioctl data: ioc_len = %u, max_len = %d\n",
- data->ioc_len, max_len);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static inline int
-obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
-{
- char *ptr;
- struct obd_ioctl_data *overlay;
-
- if (!pbuf)
- return 1;
-
- overlay = (struct obd_ioctl_data *)pbuf;
-
- /* Preserve the caller's buffer pointers */
- overlay->ioc_inlbuf1 = data->ioc_inlbuf1;
- overlay->ioc_inlbuf2 = data->ioc_inlbuf2;
- overlay->ioc_inlbuf3 = data->ioc_inlbuf3;
- overlay->ioc_inlbuf4 = data->ioc_inlbuf4;
-
- memcpy(data, pbuf, sizeof(*data));
-
- ptr = overlay->ioc_bulk;
- if (data->ioc_inlbuf1)
- LOGU(data->ioc_inlbuf1, data->ioc_inllen1, ptr);
-
- if (data->ioc_inlbuf2)
- LOGU(data->ioc_inlbuf2, data->ioc_inllen2, ptr);
-
- if (data->ioc_inlbuf3)
- LOGU(data->ioc_inlbuf3, data->ioc_inllen3, ptr);
-
- if (data->ioc_inlbuf4)
- LOGU(data->ioc_inlbuf4, data->ioc_inllen4, ptr);
-
- return 0;
-}
-
-#endif /* !__KERNEL__ */
-
/*
* OBD_IOC_DATA_TYPE is only for compatibility reasons with older
* Linux Lustre user tools. New ioctls should NOT use this macro as
--
1.8.3.1
[toc] | [prev] | [next] | [standalone]
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Date | 2017-08-20 04:50 +0200 |
| Subject | [PATCH 04/64 v2] staging: lustre: uapi: update URL doc link in lustre_fid.h |
| Message-ID | <ugotl-14b-15@gated-at.bofh.it> |
| In reply to | #1715850 |
From: Ben Evans <bevans@cray.com>
The wiki has been revived so update the URL about the FID
design in lustre_fid.h.
Signed-off-by: Ben Evans <bevans@cray.com>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/22712
Reviewed-on: https://review.whamcloud.com/24569
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h
index 681f698..0446bec 100644
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@@ -41,7 +41,7 @@
*
* @{
*
- * http://wiki.old.lustre.org/index.php/Architecture_-_Interoperability_fids_zfs
+ * http://wiki.lustre.org/index.php/Architecture_-_Interoperability_fids_zfs
* describes the FID namespace and interoperability requirements for FIDs.
* The important parts of that document are included here for reference.
*
--
1.8.3.1
[toc] | [prev] | [next] | [standalone]
| From | James Simmons <jsimmons@infradead.org> |
|---|---|
| Date | 2017-08-20 04:50 +0200 |
| Subject | [PATCH 09/64 v2] staging: lustre: uapi: remove obd_ioctl_popdata() wrapper |
| Message-ID | <ugotl-14b-13@gated-at.bofh.it> |
| In reply to | #1715850 |
Replace obd_ioctl_popdata() with direct copy_to_user() call.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/24568
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
.../lustre/lustre/include/lustre/lustre_ioctl.h | 1 -
drivers/staging/lustre/lustre/obdclass/class_obd.c | 18 +++++++-----------
.../lustre/lustre/obdclass/linux/linux-module.c | 8 --------
3 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
index 7a61a00..da9a071 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
@@ -209,7 +209,6 @@ static inline int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
}
int obd_ioctl_getdata(char **buf, int *len, void __user *arg);
-int obd_ioctl_popdata(void __user *arg, void *data, int len);
/*
* OBD_IOC_DATA_TYPE is only for compatibility reasons with older
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8cc1fdc..477d611 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -206,8 +206,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
memcpy(data->ioc_bulk, LUSTRE_VERSION_STRING,
strlen(LUSTRE_VERSION_STRING) + 1);
- err = obd_ioctl_popdata((void __user *)arg, data, len);
- if (err)
+ if (copy_to_user((void __user *)arg, data, len))
err = -EFAULT;
goto out;
@@ -225,9 +224,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
goto out;
}
- err = obd_ioctl_popdata((void __user *)arg, data,
- sizeof(*data));
- if (err)
+ if (copy_to_user((void __user *)arg, data, sizeof(*data)))
err = -EFAULT;
goto out;
}
@@ -263,8 +260,8 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
dev);
- err = obd_ioctl_popdata((void __user *)arg, data,
- sizeof(*data));
+
+ if (copy_to_user((void __user *)arg, data, sizeof(*data)))
if (err)
err = -EFAULT;
goto out;
@@ -304,9 +301,9 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
(int)index, status, obd->obd_type->typ_name,
obd->obd_name, obd->obd_uuid.uuid,
atomic_read(&obd->obd_refcount));
- err = obd_ioctl_popdata((void __user *)arg, data, len);
- err = 0;
+ if (copy_to_user((void __user *)arg, data, len))
+ err = -EFAULT;
goto out;
}
}
@@ -361,8 +358,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
if (err)
goto out;
- err = obd_ioctl_popdata((void __user *)arg, data, len);
- if (err)
+ if (copy_to_user((void __user *)arg, data, len))
err = -EFAULT;
goto out;
}
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index eb88bd9..3a394d2 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -151,14 +151,6 @@ int obd_ioctl_getdata(char **buf, int *len, void __user *arg)
}
EXPORT_SYMBOL(obd_ioctl_getdata);
-int obd_ioctl_popdata(void __user *arg, void *data, int len)
-{
- int err;
-
- err = copy_to_user(arg, data, len) ? -EFAULT : 0;
- return err;
-}
-
/* opening /dev/obd */
static int obd_class_open(struct inode *inode, struct file *file)
{
--
1.8.3.1
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web