← Back to branch summary

~ubuntu-branches/ubuntu/wily/glusterfs/wily

« back to all changes in this revision

Viewing changes to rpc/rpc-transport/rdma/src/rdma.c

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi, Louis Zuckerman, Patrick Matthäi
  • Date: 2011-05-01 14:41:05 UTC
  • mfrom: (1.3.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110501144105-l5dut674ggp5f2yr
Tags: 3.1.4-1
http://bugs.debian.org/615166
http://bugs.debian.org/615859
http://bugs.debian.org/621169
http://bugs.debian.org/623234
[ Louis Zuckerman ]
* New upstream release.
  - Add patch 01-remove-argp-m64-option.diff to allow 32bit builds.
* Enabled pure-server or pure-client installation.
  - Moved glusterfsd binary to libglusterfs0.
  - Added dependency on libglusterfs0 to -server and -client packages.
  - Removed dependency on glusterfs-client from glusterfs-server.
  - Moved manpages for binaries into their respective packages
* Updated default configuration files to 3.1-series versions
  - Added glusterd.vol to glusterfs-server, required for Elastic Volume Mgr.
  - Removed unnecessary 3.0-series sample volume-files from glusterfs-server
  Closes: #615166
* Replaced init-script for glusterfs-server with new 3.1-series version.
  Closes: #615859

[ Patrick Matthäi ]
* Bump Standards-Version to 3.9.2 (no changes needed).
* Build with hardening-wrapper.
* Comment out all dependency_libs lines in .la files.
  Closes: #621169
* Add logrotate script to the libglusterfs0 package.
  Closes: #623234
* Remove rpath from all libs and binaries.
* Add patch 02-fix-spelling-errors.diff, which fixes multiple spelling errors
  in the source code.
* Add lintian overrides for the libglusterfs0 package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
rpc/rpc-transport/rdma/src/rdma.c
2871
2871
        case RDMA_MSGP:
2872
2872
                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
2873
2873
                        "rdma msg of msg-type RDMA_MSGP should not have been "
2874
 
                        "recieved");
 
2874
                        "received");
2875
2875
                ret = -1;
2876
2876
                break;
2877
2877
 
2878
2878
        case RDMA_DONE:
2879
2879
                gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
2880
2880
                        "rdma msg of msg-type RDMA_DONE should not have been "
2881
 
                        "recieved");
 
2881
                        "received");
2882
2882
                ret = -1;
2883
2883
                break;
2884
2884
 
3050
3050
                }
3051
3051
 
3052
3052
                /* handling the case where both hdr and payload of 
3053
 
                 * GF_FOP_READ_CBK were recieved in a single iobuf
 
3053
                 * GF_FOP_READ_CBK were received in a single iobuf
3054
3054
                 * because of server sending entire msg as inline without
3055
3055
                 * doing rdma writes.
3056
3056
                 */