staging:lustre: merge socklnd_lib-linux.h into socklnd.h
authorJohn L. Hammond <john.hammond@intel.com>
Thu, 11 Jun 2015 19:18:10 +0000 (15:18 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Jun 2015 05:39:18 +0000 (22:39 -0700)
commit12c41f001015eb00fff6c677a2d83332cfd2c8b9
treeb7fec89f5dc7993f980f44ca18c0085a80c77d25
parent134a7a7a10b70dced17e39136f65c4df81ebfb3a
staging:lustre: merge socklnd_lib-linux.h into socklnd.h

Originally socklnd_lib-linux.h contained linux specific
wrappers and defines but since the linux kernel is the
only supported platform now we can merge what little
remains in the header into socklnd.h. This is broken
out of the original patch 12932 that was merged to the
Intel/OpenSFS branch.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/12932
Reviewed-by: Isaac Huang <he.huang@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h [deleted file]
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c