← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/freebsd/vmhgfs/transport.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/freebsd/vmhgfs/transport.c
73
73
   uint32 reqBufferSize;
74
74
   int ret;
75
75
 
76
 
   req = HgfsKReq_AllocateRequest(sip->reqs);
 
76
   req = HgfsKReq_AllocateRequest(sip->reqs, &ret);
77
77
   if (!req) {
78
 
      return ENOMEM;
 
78
      return ret;
79
79
   }
80
80
 
81
81
   /* Set the correct header values */
174
174
   uint32 reqBufferSize;
175
175
 
176
176
   DEBUG(VM_DEBUG_LOG, "Trace enter.\n");
177
 
   req = HgfsKReq_AllocateRequest(sip->reqs);
 
177
   req = HgfsKReq_AllocateRequest(sip->reqs, &ret);
178
178
   if (!req) {
179
179
      DEBUG(VM_DEBUG_FAIL, "HgfsKReq_AllocateRequest failed.\n");
180
 
      return ENOMEM;
 
180
      return ret;
181
181
   }
182
182
 
183
183
   requestHeader = (HgfsRequest *)HgfsKReq_GetPayload(req);
276
276
   uint32 repSize;
277
277
   int ret;
278
278
 
279
 
   req = HgfsKReq_AllocateRequest(sip->reqs);
 
279
   req = HgfsKReq_AllocateRequest(sip->reqs, &ret);
280
280
   if (!req) {
281
 
      return ENOMEM;
 
281
      return ret;
282
282
   }
283
283
 
284
284
   /*
347
347
   uint32 repSize;
348
348
   int ret;
349
349
 
350
 
   req = HgfsKReq_AllocateRequest(sip->reqs);
 
350
   req = HgfsKReq_AllocateRequest(sip->reqs, &ret);
351
351
   if (!req) {
352
 
      return ENOMEM;
 
352
      return ret;
353
353
   }
354
354
 
355
355
   /*