← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to hurd/lookup-retry.c

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hurd/lookup-retry.c
24
24
#include <fcntl.h>
25
25
#include <string.h>
26
26
#include <_itoa.h>
 
27
#include <eloop-threshold.h>
27
28
 
28
29
/* Translate the error from dir_lookup into the error the user sees.  */
29
30
static inline error_t
103
104
          /* Fall through.  */
104
105
 
105
106
        case FS_RETRY_NORMAL:
106
 
          if (nloops++ >= SYMLOOP_MAX)
 
107
          if (nloops++ >= __eloop_threshold ())
107
108
            {
108
109
              __mach_port_deallocate (__mach_task_self (), *result);
109
110
              return ELOOP;
180
181
              dirport = INIT_PORT_CRDIR;
181
182
              if (*result != MACH_PORT_NULL)
182
183
                __mach_port_deallocate (__mach_task_self (), *result);
183
 
              if (nloops++ >= SYMLOOP_MAX)
 
184
              if (nloops++ >= __eloop_threshold ())
184
185
                return ELOOP;
185
186
              file_name = &retryname[1];
186
187
              break;