← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xlators/performance/io-cache/src/io-cache.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/io-cache/src/io-cache.c
1671
1671
                                table->max_file_size);
1672
1672
                }
1673
1673
 
1674
 
                if ((max_file_size >= 0) & (min_file_size > max_file_size)) {
 
1674
                if ((max_file_size >= 0) && (min_file_size > max_file_size)) {
1675
1675
                        gf_log ("io-cache", GF_LOG_ERROR, "minimum size (%"
1676
1676
                                PRIu64") of a file that can be cached is "
1677
1677
                                "greater than maximum size (%"PRIu64"). "