← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xlators/performance/write-behind/src/write-behind.c

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi
  • Date: 2011-06-26 21:00:42 UTC
  • mfrom: (1.3.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110626210042-ps1aim0cwz06tkx1
Tags: 3.2.1-1
http://bugs.debian.org/630147
http://bugs.debian.org/630146
* New upstream release.
  - Refresh patch 02-spelling-error.
* Wrap dependencies.
* Merge libglusterfs0 and libglusterfs-dev package to glusterfs-common.
  Closes: #630147
* Use python-module.mk and remove useless python bytecode files.
  Closes: #630146

Show diffs side-by-side

added added

removed removed

Lines of Context:
xlators/performance/write-behind/src/write-behind.c
322
322
        file->window_conf = conf->window_size;
323
323
        file->flags = flags;
324
324
 
 
325
        LOCK_INIT (&file->lock);
 
326
 
325
327
        fd_ctx_set (fd, this, (uint64_t)(long)file);
326
328
 
327
329
out:
1367
1369
                        goto out;
1368
1370
                }
1369
1371
 
1370
 
                /* If O_DIRECT then, we disable chaching */
1371
 
                if (((flags & O_DIRECT) == O_DIRECT)
1372
 
                    || ((flags & O_ACCMODE) == O_RDONLY)
1373
 
                    || (((flags & O_SYNC) == O_SYNC)
1374
 
                        && conf->enable_O_SYNC == _gf_true)) {
1375
 
                        file->window_conf = 0;
1376
 
                }
1377
 
 
1378
 
                if (wbflags & GF_OPEN_NOWB) {
1379
 
                        file->disabled = 1;
1380
 
                }
1381
 
 
1382
 
                LOCK_INIT (&file->lock);
 
1372
                LOCK (&file->lock);
 
1373
                {
 
1374
                        /* If O_DIRECT then, we disable chaching */
 
1375
                        if (((flags & O_DIRECT) == O_DIRECT)
 
1376
                            || ((flags & O_ACCMODE) == O_RDONLY)
 
1377
                            || (((flags & O_SYNC) == O_SYNC)
 
1378
                                && conf->enable_O_SYNC == _gf_true)) {
 
1379
                                file->window_conf = 0;
 
1380
                        }
 
1381
 
 
1382
                        if (wbflags & GF_OPEN_NOWB) {
 
1383
                                file->disabled = 1;
 
1384
                        }
 
1385
                }
 
1386
                UNLOCK (&file->lock);
1383
1387
        }
1384
1388
 
1385
1389
out:
1443
1447
                        goto out;
1444
1448
                }
1445
1449
 
1446
 
                /* If O_DIRECT then, we disable chaching */
1447
 
                if (frame->local) {
1448
 
                        if (((flags & O_DIRECT) == O_DIRECT)
1449
 
                            || ((flags & O_ACCMODE) == O_RDONLY)
1450
 
                            || (((flags & O_SYNC) == O_SYNC)
1451
 
                                && (conf->enable_O_SYNC == _gf_true))) {
1452
 
                                file->window_conf = 0;
 
1450
                LOCK (&file->lock);
 
1451
                {
 
1452
                        /* If O_DIRECT then, we disable chaching */
 
1453
                        if (frame->local) {
 
1454
                                if (((flags & O_DIRECT) == O_DIRECT)
 
1455
                                    || ((flags & O_ACCMODE) == O_RDONLY)
 
1456
                                    || (((flags & O_SYNC) == O_SYNC)
 
1457
                                        && (conf->enable_O_SYNC == _gf_true))) {
 
1458
                                        file->window_conf = 0;
 
1459
                                }
1453
1460
                        }
1454
1461
                }
1455
 
 
1456
 
                LOCK_INIT (&file->lock);
 
1462
                UNLOCK (&file->lock);
1457
1463
        }
1458
1464
 
1459
1465
        frame->local = NULL;