diff for duplicates of <87zkxyvtjt.fsf@patl.com> diff --git a/a/1.txt b/N1/1.txt index 49f997f..4d86ae7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,3 +86,20 @@ index 0eaa929..b809508 100644 - status = -EINVAL; - goto bail; - } +- + if (ocfs2_setup_osb_uuid(osb, di->id2.i_super.s_uuid, + sizeof(di->id2.i_super.s_uuid))) { + mlog(ML_ERROR, "Out of memory trying to setup our uuid.\n"); +@@ -2381,6 +2414,12 @@ static int ocfs2_check_volume(struct ocfs2_super *osb) + goto finally; + } + ++ /* Now that journal has been initialized, check to make sure ++ entire volume is addressable. */ ++ status = ocfs2_check_addressable(osb); ++ if (status) ++ goto finally; ++ + /* If the journal was unmounted cleanly then we don't want to + * recover anything. Otherwise, journal_load will do that + * dirty work for us :) */ diff --git a/a/content_digest b/N1/content_digest index 18edb3b..88a634c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\0871vbax86w.fsf@patl.com\0" "From\0Patrick J. LoPresti <lopresti@gmail.com>\0" - "Subject\0[PATCH 2/2] OCFS2: Allow huge (> 16 TiB) volumes to mount\0" + "Subject\0[Ocfs2-devel] [PATCH 2/2] OCFS2: Allow huge (> 16 TiB) volumes to mount\0" "Date\0Sun, 11 Jul 2010 10:04:38 -0700\0" "To\0ocfs2-devel@oss.oracle.com\0" "Cc\0linux-kernel@vger.kernel.org" @@ -95,6 +95,23 @@ "-\t\t \"what jbd can address in 32 bits.\\n\");\n" "-\t\tstatus = -EINVAL;\n" "-\t\tgoto bail;\n" - "-\t}" + "-\t}\n" + "-\n" + " \tif (ocfs2_setup_osb_uuid(osb, di->id2.i_super.s_uuid,\n" + " \t\t\t\t sizeof(di->id2.i_super.s_uuid))) {\n" + " \t\tmlog(ML_ERROR, \"Out of memory trying to setup our uuid.\\n\");\n" + "@@ -2381,6 +2414,12 @@ static int ocfs2_check_volume(struct ocfs2_super *osb)\n" + " \t\tgoto finally;\n" + " \t}\n" + " \n" + "+\t/* Now that journal has been initialized, check to make sure\n" + "+\t entire volume is addressable. */\n" + "+\tstatus = ocfs2_check_addressable(osb);\n" + "+\tif (status)\n" + "+\t\tgoto finally;\n" + "+\n" + " \t/* If the journal was unmounted cleanly then we don't want to\n" + " \t * recover anything. Otherwise, journal_load will do that\n" + " \t * dirty work for us :) */" -f1e3dcb554fc759b17a0a37569a8db428c23b78a8d29eba324cf4b38fb4bf724 +959cafc4247fb8512505dac36c5ff59177bfc60eafa1e4d2fc7201c8b54b225f
diff --git a/a/1.txt b/N2/1.txt index 49f997f..4d86ae7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -86,3 +86,20 @@ index 0eaa929..b809508 100644 - status = -EINVAL; - goto bail; - } +- + if (ocfs2_setup_osb_uuid(osb, di->id2.i_super.s_uuid, + sizeof(di->id2.i_super.s_uuid))) { + mlog(ML_ERROR, "Out of memory trying to setup our uuid.\n"); +@@ -2381,6 +2414,12 @@ static int ocfs2_check_volume(struct ocfs2_super *osb) + goto finally; + } + ++ /* Now that journal has been initialized, check to make sure ++ entire volume is addressable. */ ++ status = ocfs2_check_addressable(osb); ++ if (status) ++ goto finally; ++ + /* If the journal was unmounted cleanly then we don't want to + * recover anything. Otherwise, journal_load will do that + * dirty work for us :) */ diff --git a/a/content_digest b/N2/content_digest index 18edb3b..3f0e41c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -95,6 +95,23 @@ "-\t\t \"what jbd can address in 32 bits.\\n\");\n" "-\t\tstatus = -EINVAL;\n" "-\t\tgoto bail;\n" - "-\t}" + "-\t}\n" + "-\n" + " \tif (ocfs2_setup_osb_uuid(osb, di->id2.i_super.s_uuid,\n" + " \t\t\t\t sizeof(di->id2.i_super.s_uuid))) {\n" + " \t\tmlog(ML_ERROR, \"Out of memory trying to setup our uuid.\\n\");\n" + "@@ -2381,6 +2414,12 @@ static int ocfs2_check_volume(struct ocfs2_super *osb)\n" + " \t\tgoto finally;\n" + " \t}\n" + " \n" + "+\t/* Now that journal has been initialized, check to make sure\n" + "+\t entire volume is addressable. */\n" + "+\tstatus = ocfs2_check_addressable(osb);\n" + "+\tif (status)\n" + "+\t\tgoto finally;\n" + "+\n" + " \t/* If the journal was unmounted cleanly then we don't want to\n" + " \t * recover anything. Otherwise, journal_load will do that\n" + " \t * dirty work for us :) */" -f1e3dcb554fc759b17a0a37569a8db428c23b78a8d29eba324cf4b38fb4bf724 +8c6f1b57ed5bc093e09542c807ae73c0cc67b7d75fcaa1ea79367314f092edad
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.