← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334

« back to all changes in this revision

Viewing changes to src/afs/VNOPS/afs_vnop_flock.c

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hartman
  • Date: 2006-10-21 20:57:09 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061021205709-y5keam1v20qxjwwo
Tags: 1.4.2-2
Upstream fix to prevent butc segfaulting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/afs/VNOPS/afs_vnop_flock.c
16
16
#include "afs/param.h"
17
17
 
18
18
RCSID
19
 
    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.4 2006/02/27 20:35:12 shadow Exp $");
 
19
    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.6 2006/06/02 21:23:52 shadow Exp $");
20
20
 
21
21
#include "afs/sysincludes.h"    /* Standard vendor system headers */
22
22
#include "afsincludes.h"        /* Afs-based standard headers */
24
24
#include "afs/afs_cbqueue.h"
25
25
#include "afs/nfsclient.h"
26
26
#include "afs/afs_osidnlc.h"
 
27
#include "afs/unified_afs.h"
27
28
 
28
29
/* Static prototypes */
29
30
static int HandleGetLock(register struct vcache *avc,
422
423
                break;
423
424
            }
424
425
            /* now, if we got EWOULDBLOCK, and we're supposed to wait, we do */
425
 
            if (((code == EWOULDBLOCK) || (code == EAGAIN))
 
426
            if (((code == EWOULDBLOCK) || (code == EAGAIN) || 
 
427
                 (code == UAEWOULDBLOCK) || (code == UAEAGAIN))
426
428
                && !(acom & LOCK_NB)) {
427
429
                /* sleep for a second, allowing interrupts */
428
430
                ReleaseWriteLock(&avc->lock);