← Back to branch summary

~wb-munzinger/+junk/ocfs2-tools

« back to all changes in this revision

Viewing changes to libocfs2/blockcheck.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-01-14 12:46:49 UTC
  • mfrom: (1.1.10 upstream) (0.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110114124649-vbe5qz211f3zxwuf
Tags: 1.6.3-1ubuntu1
https://launchpad.net/bugs/703008
* Merge from debian unstable (LP: #703008).  Remaining changes:
  - Fix configure tests for ld --as-needed.
  - Fix build failure with ld --no-add-needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libocfs2/blockcheck.c
34
34
#include "ocfs2/bitops.h"
35
35
#include "ocfs2/byteorder.h"
36
36
 
37
 
#include "blockcheck.h"
38
37
#include "crc32table.h"
39
38
 
40
39
 
388
387
{
389
388
        errcode_t err = 0;
390
389
 
391
 
        if (ocfs2_meta_ecc(OCFS2_RAW_SB(fs->fs_super)))
 
390
        if (ocfs2_meta_ecc(OCFS2_RAW_SB(fs->fs_super)) &&
 
391
            !(fs->fs_flags & OCFS2_FLAG_NO_ECC_CHECKS))
392
392
                err = ocfs2_block_check_validate(data, fs->fs_blocksize, bc);
393
393
 
394
394
        return err;