← Back to branch summary

~wb-munzinger/+junk/ocfs2-tools

« back to all changes in this revision

Viewing changes to tunefs.ocfs2/libocfs2ne.c

  • Committer: David Weber
  • Date: 2012-01-30 08:42:00 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: wb@munzinger.de-20120130084200-c8cy478mu9fk7tkf
Import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tunefs.ocfs2/libocfs2ne.c
1059
1059
        errcode_t ret = 0;
1060
1060
        struct tunefs_trailer_context *our_tc = NULL;
1061
1061
 
 
1062
        if ((di->i_dyn_features & OCFS2_INLINE_DATA_FL) ||
 
1063
            ocfs2_dir_has_trailer(fs, di))
 
1064
                goto out;
 
1065
 
1062
1066
        if (!tc) {
1063
1067
                ret = tunefs_prepare_dir_trailer(fs, di, &our_tc);
1064
1068
                if (ret)
1357
1361
 
1358
1362
                err = ocfs2_initialize_dlm(master_fs, WHOAMI);
1359
1363
                if (flags & TUNEFS_FLAG_NOCLUSTER) {
1360
 
                        if (err == O2CB_ET_INVALID_STACK_NAME) {
 
1364
                        if (err == O2CB_ET_INVALID_STACK_NAME ||
 
1365
                            err == O2CB_ET_INVALID_CLUSTER_NAME ||
 
1366
                            err == O2CB_ET_INVALID_HEARTBEAT_MODE) {
1361
1367
                                /*
1362
1368
                                 * We expected this - why else ask for
1363
1369
                                 * TUNEFS_FLAG_NOCLUSTER?