← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xlators/cluster/afr/src/afr-lk-common.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/cluster/afr/src/afr-lk-common.c
563
563
                               op_errno, (long) cookie);
564
564
 
565
565
        if (op_ret < 0 && op_errno != ENOTCONN && op_errno != EBADFD) {
566
 
                gf_log (this->name, GF_LOG_INFO,
 
566
                gf_log (this->name, GF_LOG_ERROR,
567
567
                        "%s: unlock failed %s",
568
568
                        local->loc.path, strerror (op_errno));
569
569
        }
928
928
 
929
929
                        local->op_ret           = -1;
930
930
                        int_lock->lock_op_ret   = -1;
931
 
                        local->op_errno         = EINVAL;
932
 
                        int_lock->lock_op_errno = EINVAL;
933
931
 
934
932
                        afr_copy_locked_nodes (frame, this);
935
933
 
963
961
 
964
962
                local->op_ret           = -1;
965
963
                int_lock->lock_op_ret   = -1;
966
 
                local->op_errno         = EAGAIN;
967
 
                int_lock->lock_op_errno = EAGAIN;
968
964
 
969
965
                afr_copy_locked_nodes (frame, this);
970
966
 
1271
1267
                                                   priv->children[i],
1272
1268
                                                   priv->children[i]->fops->entrylk,
1273
1269
                                                   this->name, loc, basename,
1274
 
                                                   ENTRYLK_LOCK, ENTRYLK_WRLCK);
 
1270
                                                   ENTRYLK_LOCK_NB, ENTRYLK_WRLCK);
1275
1271
 
1276
1272
                                if (!--call_count)
1277
1273
                                        break;