diff for duplicates of <20130529062213.GF23932@mwanda> diff --git a/a/1.txt b/N1/1.txt index a1857b1..ddd5d96 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,19 +26,16 @@ index d4d3897..132b64e 100644 - 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; - } @@ -56,11 +53,10 @@ index d4d3897..132b64e 100644 + 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 eceba2c..c260a17 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01369753140-28802-1-git-send-email-emilgoode@gmail.com\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] ceph: tidy ceph_mdsmap_decode() a little\0" - "Date\0Wed, 29 May 2013 09:22:13 +0300\0" + "Date\0Wed, 29 May 2013 06:22:13 +0000\0" "To\0Sage Weil <sage@inktank.com>\0" "Cc\0ceph-devel@vger.kernel.org" linux-kernel@vger.kernel.org @@ -37,19 +37,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" @@ -67,14 +64,13 @@ "+\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" " \t}" -086e4c78596f55e2e2ef4498bab4583f386f38db29933081c6af59297c6d8f95 +7183e327dfcbceeb20fcfebf77dcdddc0054473ec06c6b637a32709eb4aafd43
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.