diff for duplicates of <1369753140-28802-1-git-send-email-emilgoode@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8a167d5..fa75659 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,14 +14,12 @@ index 9278dec..d4d3897 100644 --- a/fs/ceph/mdsmap.c +++ b/fs/ceph/mdsmap.c @@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) - 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); @@ -170,7 +172,7 @@ bad: DUMP_PREFIX_OFFSET, 16, 1, start, end - start, true); diff --git a/a/content_digest b/N1/content_digest index a147fc4..417e93a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Emil Goode <emilgoode@gmail.com>\0" "Subject\0[PATCH] ceph: improve error handling in ceph_mdsmap_decode\0" - "Date\0Tue, 28 May 2013 16:59:00 +0200\0" + "Date\0Tue, 28 May 2013 14:59:00 +0000\0" "To\0sage@inktank.com\0" "Cc\0ceph-devel@vger.kernel.org" linux-kernel@vger.kernel.org @@ -24,14 +24,12 @@ "--- a/fs/ceph/mdsmap.c\n" "+++ b/fs/ceph/mdsmap.c\n" "@@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)\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" "@@ -170,7 +172,7 @@ bad:\n" " \t\t DUMP_PREFIX_OFFSET, 16, 1,\n" " \t\t start, end - start, true);\n" @@ -44,4 +42,4 @@ "-- \n" 1.7.10.4 -be5c995d8ba380d3213666c5ff9ef73d43f2cebee7e7dc5daa1aa50644e3495f +af3ba462427e1d75dd354e9cc80fdcb22cab1854eff61f9666882f8ff7002a10
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.