diff for duplicates of <51A5AB81.5070908@bfs.de> diff --git a/a/1.txt b/N1/1.txt index 95fa6ff..daef387 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,19 +29,16 @@ Am 29.05.2013 08:22, schrieb Dan Carpenter: > - m->m_info[mds].global_id = global_id; > - m->m_info[mds].state = state; > - m->m_info[mds].addr = addr; -> - m->m_info[mds].laggy = -> - (laggy_since.tv_sec != 0 || +> - m->m_info[mds].laggy > - (laggy_since.tv_sec != 0 || > - laggy_since.tv_nsec != 0); > - m->m_info[mds].num_export_targets = num_export_targets; > - if (num_export_targets) { -> - m->m_info[mds].export_targets = -> - kcalloc(num_export_targets, sizeof(u32), +> - m->m_info[mds].export_targets > - kcalloc(num_export_targets, sizeof(u32), > - GFP_NOFS); -> - if (m->m_info[mds].export_targets == NULL) +> - if (m->m_info[mds].export_targets = NULL) > - goto badmem; > - for (j = 0; j < num_export_targets; j++) -> - m->m_info[mds].export_targets[j] = -> - ceph_decode_32(&pexport_targets); +> - m->m_info[mds].export_targets[j] > - ceph_decode_32(&pexport_targets); > - } else { > - m->m_info[mds].export_targets = NULL; > - } @@ -68,11 +65,10 @@ re, > + if (num_export_targets) { > + info->export_targets = kcalloc(num_export_targets, > + sizeof(u32), GFP_NOFS); -> + if (info->export_targets == NULL) +> + if (info->export_targets = NULL) > + goto badmem; > + for (j = 0; j < num_export_targets; j++) -> + info->export_targets[j] = -> + ceph_decode_32(&pexport_targets); +> + info->export_targets[j] > + ceph_decode_32(&pexport_targets); > + } else { > + info->export_targets = NULL; > } diff --git a/a/content_digest b/N1/content_digest index 2fe6599..d490181 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130529062213.GF23932@mwanda\0" "From\0walter harms <wharms@bfs.de>\0" "Subject\0Re: [patch] ceph: tidy ceph_mdsmap_decode() a little\0" - "Date\0Wed, 29 May 2013 09:17:21 +0200\0" + "Date\0Wed, 29 May 2013 07:17:21 +0000\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Sage Weil <sage@inktank.com>" ceph-devel@vger.kernel.org @@ -41,19 +41,16 @@ "> -\t\t\tm->m_info[mds].global_id = global_id;\n" "> -\t\t\tm->m_info[mds].state = state;\n" "> -\t\t\tm->m_info[mds].addr = addr;\n" - "> -\t\t\tm->m_info[mds].laggy =\n" - "> -\t\t\t\t(laggy_since.tv_sec != 0 ||\n" + "> -\t\t\tm->m_info[mds].laggy > -\t\t\t\t(laggy_since.tv_sec != 0 ||\n" "> -\t\t\t\t laggy_since.tv_nsec != 0);\n" "> -\t\t\tm->m_info[mds].num_export_targets = num_export_targets;\n" "> -\t\t\tif (num_export_targets) {\n" - "> -\t\t\t\tm->m_info[mds].export_targets =\n" - "> -\t\t\t\t\tkcalloc(num_export_targets, sizeof(u32),\n" + "> -\t\t\t\tm->m_info[mds].export_targets > -\t\t\t\t\tkcalloc(num_export_targets, sizeof(u32),\n" "> -\t\t\t\t\t\tGFP_NOFS);\n" - "> -\t\t\t\tif (m->m_info[mds].export_targets == NULL)\n" + "> -\t\t\t\tif (m->m_info[mds].export_targets = NULL)\n" "> -\t\t\t\t\tgoto badmem;\n" "> -\t\t\t\tfor (j = 0; j < num_export_targets; j++)\n" - "> -\t\t\t\t\tm->m_info[mds].export_targets[j] =\n" - "> -\t\t\t\t\t ceph_decode_32(&pexport_targets);\n" + "> -\t\t\t\t\tm->m_info[mds].export_targets[j] > -\t\t\t\t\t ceph_decode_32(&pexport_targets);\n" "> -\t\t\t} else {\n" "> -\t\t\t\tm->m_info[mds].export_targets = NULL;\n" "> -\t\t\t}\n" @@ -80,11 +77,10 @@ "> +\t\tif (num_export_targets) {\n" "> +\t\t\tinfo->export_targets = kcalloc(num_export_targets,\n" "> +\t\t\t\t\t\t sizeof(u32), GFP_NOFS);\n" - "> +\t\t\tif (info->export_targets == NULL)\n" + "> +\t\t\tif (info->export_targets = NULL)\n" "> +\t\t\t\tgoto badmem;\n" "> +\t\t\tfor (j = 0; j < num_export_targets; j++)\n" - "> +\t\t\t\tinfo->export_targets[j] =\n" - "> +\t\t\t\t ceph_decode_32(&pexport_targets);\n" + "> +\t\t\t\tinfo->export_targets[j] > +\t\t\t\t ceph_decode_32(&pexport_targets);\n" "> +\t\t} else {\n" "> +\t\t\tinfo->export_targets = NULL;\n" "> \t\t}\n" @@ -96,4 +92,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -d0a81af6d754c708e0da80dae70d4297e762b22febaa6d9fb5c4a19eb05fca67 +6e7f9be8adb24a400a966f3e459054b04b69a6f2a9f9bc5e441469da37a409d7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.