fence-agents: master - [clenaup] Fix whitespace convention issues
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a4cbf5...
Commit: a4cbf5ba86d196b236cc58ad2dee2f3317e1ee10
Parent: 91399dd3e884c50e2317ab738eea1569faa8d55a
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Sep 8 15:02:53 2014 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Sep 8 15:10:27 2014 +0200
[clenaup] Fix whitespace convention issues
---
fence/agents/lib/fencing.py.py | 4 +---
fence/agents/vmware_soap/fence_vmware_soap.py | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 557358a..640f81a 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -719,7 +719,6 @@ def check_input(device_opt, opt):
logging.getLogger().addHandler(SyslogLibHandler())
## add loggint to stderr
logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr))
-
acceptable_actions = ["on", "off", "status", "list", "monitor"]
if 1 == device_opt.count("fabric_fencing"):
@@ -1159,9 +1158,8 @@ def fence_logout(conn, logout_string, sleep=0):
def array_to_dict(ar):
return dict([[x[0].split(".")[-1], x[1]] for x in ar])
-
## Own logger handler that uses old-style syslog handler as otherwise everything is sourced
-## from /dev/syslog
+## from /dev/syslog
class SyslogLibHandler(logging.StreamHandler):
"""
A handler class that correctly push messages into syslog
diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py
index 2cea105..e47f11e 100644
--- a/fence/agents/vmware_soap/fence_vmware_soap.py
+++ b/fence/agents/vmware_soap/fence_vmware_soap.py
@@ -11,7 +11,7 @@ from suds.sudsobject import Property
from suds.transport.http import HttpAuthenticated
from suds.transport import Reply, TransportError
from fencing import *
-from fencing import fail, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF
+from fencing import fail, fail_usage, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF
from fencing import run_delay
#BEGIN_VERSION_GENERATION
@@ -33,7 +33,7 @@ class RequestsTransport(HttpAuthenticated):
def send(self, request):
self.addcredentials(request)
- resp = self.session.post(request.url, data = request.message, headers = request.headers, cert = self.cert, verify = self.verify)
+ resp = self.session.post(request.url, data=request.message, headers=request.headers, cert=self.cert, verify=self.verify)
result = Reply(resp.status_code, resp.headers, resp.content)
return result
@@ -58,7 +58,7 @@ def soap_login(options):
try:
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : ""}
- conn = Client(url + "/vimService.wsdl", location = url, transport = RequestsTransport(verify = verify), headers = headers)
+ conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers)
mo_ServiceInstance = Property('ServiceInstance')
mo_ServiceInstance._type = 'ServiceInstance'
9 years, 7 months
fence-agents: master - fence_cisco_ucs & fence_vmware_soap: Logout has to be performed even when fencing fails
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=91399d...
Commit: 91399dd3e884c50e2317ab738eea1569faa8d55a
Parent: 5cb174f204865d7ffe6d9edbfe8177b54bd61b49
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Sep 8 15:10:05 2014 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Sep 8 15:10:05 2014 +0200
fence_cisco_ucs & fence_vmware_soap: Logout has to be performed even when fencing fails
Previously, logout was not performed in the case when fence agent was aborted e.g. timeout. What could
lead to a situation when connections were not closed correctly. In the extreme case, it was not possible
to log into device at all
Resolves: rhbz#1111599
---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 35 +++++++++++++++---------
fence/agents/vmware_soap/fence_vmware_soap.py | 29 ++++++++++++--------
2 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 888d689..f411433 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -19,6 +19,8 @@ RE_STATUS = re.compile("<lsPower .*? state=\"(.*?)\"", re.IGNORECASE)
RE_GET_DN = re.compile(" dn=\"(.*?)\"", re.IGNORECASE)
RE_GET_DESC = re.compile(" descr=\"(.*?)\"", re.IGNORECASE)
+options_global = None
+
def get_power_status(conn, options):
del conn
@@ -115,27 +117,37 @@ def define_new_opts():
"default" : "",
"order" : 1}
+def logout():
+ ### Logout; we do not care about result as we will end in any case
+ try:
+ send_command(options_global, "<aaaLogout inCookie=\"" + options_global["cookie"] + "\" />",
+ int(options_global["--shell-timeout"]))
+ except Exception:
+ pass
+
def main():
+ global options_global
device_opt = ["ipaddr", "login", "passwd", "ssl", "notls", "port", "web", "suborg"]
atexit.register(atexit_handler)
+ atexit.register(logout)
define_new_opts()
- options = check_input(device_opt, process_input(device_opt))
+ options_global = check_input(device_opt, process_input(device_opt))
docs = {}
docs["shortdesc"] = "Fence agent for Cisco UCS"
docs["longdesc"] = "fence_cisco_ucs is an I/O Fencing agent which can be \
used with Cisco UCS to fence machines."
docs["vendorurl"] = "http://www.cisco.com"
- show_docs(options, docs)
+ show_docs(options_global, docs)
- run_delay(options)
+ run_delay(options_global)
### Login
try:
- res = send_command(options, "<aaaLogin inName=\"" + options["--username"] +
- "\" inPassword=\"" + options["--password"] + "\" />", int(options["--login-timeout"]))
+ res = send_command(options_global, "<aaaLogin inName=\"" + options_global["--username"] +
+ "\" inPassword=\"" + options_global["--password"] + "\" />", int(options_global["--login-timeout"]))
result = RE_COOKIE.search(res)
if result == None:
## Cookie is absenting in response
@@ -143,22 +155,19 @@ used with Cisco UCS to fence machines."
except Exception:
fail(EC_LOGIN_DENIED)
- options["cookie"] = result.group(1)
+ options_global["cookie"] = result.group(1)
##
## Modify suborg to format /suborg
- if options["--suborg"] != "":
- options["--suborg"] = "/" + options["--suborg"].lstrip("/").rstrip("/")
+ if options_global["--suborg"] != "":
+ options_global["--suborg"] = "/" + options_global["--suborg"].lstrip("/").rstrip("/")
##
## Fence operations
####
- result = fence_action(None, options, set_power_status, get_power_status, get_list)
-
- ### Logout; we do not care about result as we will end in any case
- send_command(options, "<aaaLogout inCookie=\"" + options["cookie"] + "\" />",
- int(options["--shell-timeout"]))
+ result = fence_action(None, options_global, set_power_status, get_power_status, get_list)
+ ## Logout is done every time at atexit phase
sys.exit(result)
if __name__ == "__main__":
diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py
index 3217c6b..2cea105 100644
--- a/fence/agents/vmware_soap/fence_vmware_soap.py
+++ b/fence/agents/vmware_soap/fence_vmware_soap.py
@@ -20,6 +20,9 @@ REDHAT_COPYRIGHT=""
BUILD_DATE="April, 2011"
#END_VERSION_GENERATION
+options_global = None
+conn_global = None
+
class RequestsTransport(HttpAuthenticated):
def __init__(self, **kwargs):
self.cert = kwargs.pop('cert', None)
@@ -203,12 +206,21 @@ def set_power_status(conn, options):
def remove_tmp_dir(tmp_dir):
shutil.rmtree(tmp_dir)
+def logout():
+ try:
+ conn_global.service.Logout(options_global["mo_SessionManager"])
+ except Exception:
+ pass
+
def main():
+ global options_global
+ global conn_global
device_opt = ["ipaddr", "login", "passwd", "web", "ssl", "notls", "port"]
atexit.register(atexit_handler)
+ atexit.register(logout)
- options = check_input(device_opt, process_input(device_opt))
+ options_global = check_input(device_opt, process_input(device_opt))
##
## Fence agent specific defaults
@@ -224,7 +236,7 @@ format (e.g. /datacenter/vm/Discovered virtual machine/myMachine). \
In the cases when name of yours VM is unique you can use it instead. \
Alternatively you can always use UUID to access virtual machine."
docs["vendorurl"] = "http://www.vmware.com"
- show_docs(options, docs)
+ show_docs(options_global, docs)
logging.basicConfig(level=logging.INFO)
logging.getLogger('suds.client').setLevel(logging.CRITICAL)
@@ -234,18 +246,11 @@ Alternatively you can always use UUID to access virtual machine."
##
## Operate the fencing device
####
- conn = soap_login(options)
-
- result = fence_action(conn, options, set_power_status, get_power_status, get_power_status)
+ conn_global = soap_login(options_global)
- ##
- ## Logout from system
- #####
- try:
- conn.service.Logout(options["mo_SessionManager"])
- except Exception:
- pass
+ result = fence_action(conn_global, options_global, set_power_status, get_power_status, get_power_status)
+ ## Logout from system is done automatically via atexit()
sys.exit(result)
if __name__ == "__main__":
9 years, 7 months
dlm: master - dlm: clear out addrs before calling into corosync_cft_get_node_addrs()
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=54a5a6b7137c9f6...
Commit: 54a5a6b7137c9f6e969bde8f0245a5bc3465536c
Parent: 4283123f0b13eafc46d825050c5142cf44be79c3
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Tue Sep 9 09:29:01 2014 +0100
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Tue Sep 9 09:29:01 2014 +0100
dlm: clear out addrs before calling into corosync_cft_get_node_addrs()
The corosync_cfg_get_node_addrs() call does not fill the whole of the
addrs field passed in, specifically it only writes the the address
family and IP address, leaving the port number untouched.
If the port number contains junk, then that can get passed into the
kernel by dlm_controld where it is subsequently used in the comparison
that checks for valid cluster nodes in a connection. If this happens
then an otherwise valid connection can be rejected and the dlm will
hang.
I've seen this quite often on s390 but I don't see any reason why it
might not also be causing intermittent connection problems on other
archs.
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
dlm_controld/member.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/dlm_controld/member.c b/dlm_controld/member.c
index d4031ee..10351ec 100644
--- a/dlm_controld/member.c
+++ b/dlm_controld/member.c
@@ -132,6 +132,7 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate,
quorum_node_count = 0;
memset(&quorum_nodes, 0, sizeof(quorum_nodes));
+ memset(&addrs, 0, sizeof(addrs));
for (i = 0; i < node_list_entries; i++)
quorum_nodes[quorum_node_count++] = node_list[i];
9 years, 8 months
gfs2-utils: RHEL7 - gfs2-utils tests: Fix unit tests for RHEL7
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=9142cd52...
Commit: 9142cd526adfb9739b92419fc1faa0b4730e936d
Parent: e0e4c93b80f36fc40a5d631a14615162f27f3371
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Sep 8 10:18:11 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Mon Sep 8 11:34:01 2014 +0100
gfs2-utils tests: Fix unit tests for RHEL7
Older versions of check-devel do not have ck_assert_ptr_ne nor
ck_assert_uint_eq so provide macros to map them to fail_unless calls.
Resolves: rhbz#1112342
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
tests/check_rgrp.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/check_rgrp.c b/tests/check_rgrp.c
index e5fca8d..36dffe4 100644
--- a/tests/check_rgrp.c
+++ b/tests/check_rgrp.c
@@ -5,6 +5,10 @@
// TODO: Remove this when the extern is removed from libgfs2
void print_it(const char *label, const char *fmt, const char *fmt2, ...) {}
+/* Older check-devel doesn't have these functions */
+#define ck_assert_ptr_ne(ptr, val) fail_unless(ptr != val)
+#define ck_assert_uint_eq(u1, u2) fail_unless(u1 == u2)
+
static lgfs2_rgrps_t mockup_rgrp(void)
{
struct gfs2_sbd *sdp;
9 years, 8 months
gfs2-utils: RHEL7 - gfs2-utils tests: Build unit tests with consistent cpp flags
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=e0e4c93b...
Commit: e0e4c93b80f36fc40a5d631a14615162f27f3371
Parent: 959b5cdce8602632d72b324b0a15b73cafc6dfd3
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Sep 8 12:03:40 2014 +0200
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Mon Sep 8 11:33:53 2014 +0100
gfs2-utils tests: Build unit tests with consistent cpp flags
The check_rgrp unit test was failing on ARM and s390 due to struct
gfs2_sbd having a different alignment from libgfs2. This was due to the
unit tests being built with different options to libgfs2. Fix up the
unit test CPPFLAGS to make sure the alignment is consistent.
Also bump the test timeout for check_rgrp to make sure it completes on
slower build machines.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
tests/Makefile.am | 6 ++++++
tests/check_rgrp.c | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70e77ef..b912dfa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,16 +15,22 @@ UNIT_CFLAGS = \
UNIT_LDADD = \
$(top_builddir)/gfs2/libgfs2/libgfs2.la \
@check_LIBS@
+UNIT_CPPFLAGS = \
+ -D_FILE_OFFSET_BITS=64 \
+ -D_LARGEFILE64_SOURCE \
+ -D_GNU_SOURCE
check_PROGRAMS = $(UNIT_TESTS)
check_meta_SOURCES = $(UNIT_SOURCES) check_meta.c
check_meta_CFLAGS = $(UNIT_CFLAGS)
check_meta_LDADD = $(UNIT_LDADD)
+check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
check_rgrp_SOURCES = $(UNIT_SOURCES) check_rgrp.c
check_rgrp_CFLAGS = $(UNIT_CFLAGS)
check_rgrp_LDADD = $(UNIT_LDADD)
+check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
endif
# The `:;' works around a Bash 3.2 bug when the output is not writable.
diff --git a/tests/check_rgrp.c b/tests/check_rgrp.c
index d113846..e5fca8d 100644
--- a/tests/check_rgrp.c
+++ b/tests/check_rgrp.c
@@ -125,7 +125,7 @@ static Suite * libgfs2_suite(void)
tcase_add_test(tc_rgrp, test_rbm_find_good);
tcase_add_test(tc_rgrp, test_rbm_find_bad);
tcase_add_test(tc_rgrp, test_rbm_find_lastblock);
- tcase_set_timeout(tc_rgrp, 60);
+ tcase_set_timeout(tc_rgrp, 120);
suite_add_tcase(s, tc_rgrp);
return s;
9 years, 8 months
gfs2-utils: RHEL7 - libgfs2: Move unused gfs2_bmap into fsck.gfs2
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=959b5cdc...
Commit: 959b5cdce8602632d72b324b0a15b73cafc6dfd3
Parent: 76bceb8627329127700416cab606f3d922b73aa2
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Jun 23 23:35:01 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Mon Sep 8 10:14:36 2014 +0100
libgfs2: Move unused gfs2_bmap into fsck.gfs2
struct gfs2_bmap is only ever used in fsck.gfs2 and functions which use
it were moved out of libgfs2 long ago. Complete that migration by moving
the definition of struct gfs2_bmap into fsck/fsck.h
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/fsck.h | 6 ++++++
gfs2/libgfs2/libgfs2.h | 7 -------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index 8555e9e..09db668 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -25,6 +25,12 @@
#define BAD_POINTER_TOLERANCE 10 /* How many bad pointers is too many? */
+struct gfs2_bmap {
+ uint64_t size;
+ uint64_t mapsize;
+ unsigned char *map;
+};
+
struct inode_info
{
struct osi_node node;
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 831d45b..10df2d4 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -373,13 +373,6 @@ extern int lgfs2_selfcheck(void);
extern const struct lgfs2_metadata *lgfs2_find_mtype(uint32_t mh_type, const unsigned versions);
extern const struct lgfs2_metadata *lgfs2_find_mtype_name(const char *name, const unsigned versions);
-/* bitmap.c */
-struct gfs2_bmap {
- uint64_t size;
- uint64_t mapsize;
- unsigned char *map;
-};
-
/* block_list.c */
extern struct special_blocks *blockfind(struct special_blocks *blist, uint64_t num);
9 years, 8 months
gfs2-utils: RHEL7 - gfs2-utils: Update translation template
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=76bceb86...
Commit: 76bceb8627329127700416cab606f3d922b73aa2
Parent: 1e196553a23a60f151ec661291b442bd14952030
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 5 12:28:19 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Fri Sep 5 14:57:47 2014 +0100
gfs2-utils: Update translation template
Update gfs2-utils.pot
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
po/POTFILES.in | 2 -
po/gfs2-utils.pot | 2166 ++++++++++++++++++++++++++++------------------------
2 files changed, 1166 insertions(+), 1002 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index faa56d7..579ff4b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ gfs2/fsck/initialize.c
gfs2/fsck/util.h
gfs2/fsck/pass3.c
gfs2/fsck/pass2.c
-gfs2/fsck/eattr.c
gfs2/fsck/metawalk.c
gfs2/fsck/util.c
gfs2/fsck/lost_n_found.c
@@ -31,4 +30,3 @@ gfs2/fsck/pass1b.c
gfs2/fsck/link.h
gfs2/fsck/pass5.c
gfs2/fsck/pass1.c
-gfs2/fsck/eattr.h
diff --git a/po/gfs2-utils.pot b/po/gfs2-utils.pot
index 06fb3c3..edecdea 100644
--- a/po/gfs2-utils.pot
+++ b/po/gfs2-utils.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gfs2-utils master\n"
"Report-Msgid-Bugs-To: linux-cluster(a)redhat.com\n"
-"POT-Creation-Date: 2013-07-23 10:35+0100\n"
+"POT-Creation-Date: 2014-09-05 12:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -31,19 +31,19 @@ msgstr ""
#. Translators: This is a usage string printed with --help.
#. <size> and <number> here are to commandline parameters,
#. e.g. gfs2_jadd -j <number> /dev/sda
-#: gfs2/mkfs/main_mkfs.c:53 gfs2/mkfs/main_jadd.c:85
+#: gfs2/mkfs/main_mkfs.c:53 gfs2/mkfs/main_jadd.c:88
msgid "Size of quota change file, in megabytes"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:54 gfs2/mkfs/main_jadd.c:86
+#: gfs2/mkfs/main_mkfs.c:54 gfs2/mkfs/main_jadd.c:89
msgid "Enable debugging code"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:55 gfs2/mkfs/main_mkfs.c:87 gfs2/mkfs/main_jadd.c:87
+#: gfs2/mkfs/main_mkfs.c:55 gfs2/mkfs/main_mkfs.c:87 gfs2/mkfs/main_jadd.c:90
msgid "Display this help, then exit"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:56 gfs2/mkfs/main_jadd.c:88
+#: gfs2/mkfs/main_mkfs.c:56 gfs2/mkfs/main_jadd.c:91
msgid "Size of journals, in megabytes"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "<number>"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:57 gfs2/mkfs/main_jadd.c:89
+#: gfs2/mkfs/main_mkfs.c:57 gfs2/mkfs/main_jadd.c:92
msgid "Number of journals"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
msgid "Name of the locking protocol"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:62 gfs2/mkfs/main_jadd.c:90
+#: gfs2/mkfs/main_mkfs.c:62 gfs2/mkfs/main_jadd.c:93
msgid "Don't print anything"
msgstr ""
@@ -95,16 +95,16 @@ msgstr ""
msgid "Display program version information, then exit"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:69 gfs2/mkfs/main_grow.c:75 gfs2/mkfs/main_jadd.c:95
+#: gfs2/mkfs/main_mkfs.c:69 gfs2/mkfs/main_grow.c:78 gfs2/mkfs/main_jadd.c:98
#: gfs2/tune/main.c:56
msgid "Usage:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:70 gfs2/mkfs/main_grow.c:76 gfs2/mkfs/main_jadd.c:96
+#: gfs2/mkfs/main_mkfs.c:70 gfs2/mkfs/main_grow.c:79 gfs2/mkfs/main_jadd.c:99
msgid "options"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:70 gfs2/mkfs/main_grow.c:76 gfs2/mkfs/main_jadd.c:96
+#: gfs2/mkfs/main_mkfs.c:70 gfs2/mkfs/main_grow.c:79 gfs2/mkfs/main_jadd.c:99
#: gfs2/tune/main.c:57
msgid "device"
msgstr ""
@@ -120,7 +120,7 @@ msgid ""
"specified, the whole device will be used."
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:73 gfs2/mkfs/main_grow.c:78 gfs2/mkfs/main_jadd.c:98
+#: gfs2/mkfs/main_mkfs.c:73 gfs2/mkfs/main_grow.c:81 gfs2/mkfs/main_jadd.c:101
msgid "Options:"
msgstr ""
@@ -143,105 +143,105 @@ msgstr ""
#. Translators: "discard" is a request sent to a storage device to
#. * discard a range of blocks.
-#: gfs2/mkfs/main_mkfs.c:201
+#: gfs2/mkfs/main_mkfs.c:184
#, c-format
msgid "Issuing discard request: range: %llu - %llu..."
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:206
+#: gfs2/mkfs/main_mkfs.c:189
msgid "error"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:210
+#: gfs2/mkfs/main_mkfs.c:193
#, c-format
msgid "Successful.\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:233
+#: gfs2/mkfs/main_mkfs.c:216
#, c-format
msgid "Block size not available yet.\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:260
+#: gfs2/mkfs/main_mkfs.c:243
#, c-format
msgid "Missing argument to '%s'\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:265
+#: gfs2/mkfs/main_mkfs.c:248
#, c-format
msgid "Value of '%s' is invalid\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:279
+#: gfs2/mkfs/main_mkfs.c:262
#, c-format
msgid "Option '%s' must be either 1 or 0\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:290
+#: gfs2/mkfs/main_mkfs.c:273
#, c-format
msgid "Missing argument to '-o' option\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:305
+#: gfs2/mkfs/main_mkfs.c:288
#, c-format
msgid "Invalid option '%s'\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:377 gfs2/mkfs/main_grow.c:120
-#: gfs2/mkfs/main_jadd.c:155 gfs2/fsck/main.c:105 gfs2/fsck/main.c:116
+#: gfs2/mkfs/main_mkfs.c:358 gfs2/mkfs/main_grow.c:123
+#: gfs2/mkfs/main_jadd.c:156 gfs2/fsck/main.c:110 gfs2/fsck/main.c:121
#, c-format
msgid "Please use '-h' for help.\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:390
+#: gfs2/mkfs/main_mkfs.c:371
msgid "More than one device specified (try -h for help)\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:393 gfs2/mkfs/main_jadd.c:162 gfs2/tune/main.c:93
+#: gfs2/mkfs/main_mkfs.c:374 gfs2/mkfs/main_jadd.c:163 gfs2/tune/main.c:93
#, c-format
msgid "Invalid option: %c\n"
msgstr ""
#. Translators: A lock table is a string identifying a gfs2 file system
#. * in a cluster, e.g. cluster_name:fs_name
-#: gfs2/mkfs/main_mkfs.c:411 gfs2/tune/super.c:183
+#: gfs2/mkfs/main_mkfs.c:392 gfs2/tune/super.c:184
msgid "Invalid lock table:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:418
+#: gfs2/mkfs/main_mkfs.c:399
#, c-format
msgid "No lock table specified.\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:423
+#: gfs2/mkfs/main_mkfs.c:404
msgid "invalid character"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:428 gfs2/tune/super.c:193
+#: gfs2/mkfs/main_mkfs.c:409 gfs2/tune/super.c:194
msgid "missing colon"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:431
+#: gfs2/mkfs/main_mkfs.c:412
msgid "cluster name is missing"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:433
+#: gfs2/mkfs/main_mkfs.c:414
msgid "cluster name is too long"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:437 gfs2/tune/super.c:201
+#: gfs2/mkfs/main_mkfs.c:418 gfs2/tune/super.c:202
msgid "contains more than one colon"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:439
+#: gfs2/mkfs/main_mkfs.c:420
msgid "file system name is missing"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:441 gfs2/tune/super.c:197
+#: gfs2/mkfs/main_mkfs.c:422 gfs2/tune/super.c:198
msgid "file system name is too long"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:443 gfs2/tune/super.c:167 gfs2/tune/super.c:173
+#: gfs2/mkfs/main_mkfs.c:424 gfs2/tune/super.c:168 gfs2/tune/super.c:174
#, c-format
msgid "Invalid lock protocol: %s\n"
msgstr ""
@@ -251,389 +251,440 @@ msgstr ""
#. translated to match one of the letters in the pattern printed by
#. `locale -k yesexpr` and one of the letters in the pattern printed by
#. `locale -k noexpr`
-#: gfs2/mkfs/main_mkfs.c:460
+#: gfs2/mkfs/main_mkfs.c:441
#, c-format
msgid "Are you sure you want to proceed? [y/n]"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:470
+#: gfs2/mkfs/main_mkfs.c:451
msgid "Aborted.\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:507
+#: gfs2/mkfs/main_mkfs.c:489
#, c-format
msgid "Block size must be a power of two between 512 and %d\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:511
+#: gfs2/mkfs/main_mkfs.c:493
#, c-format
msgid "Error: Block size %d is less than minimum logical block size (%lu).\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:516
+#: gfs2/mkfs/main_mkfs.c:498
#, c-format
msgid ""
"Warning: Block size %d is inefficient because it is less than the physical "
"block size (%lu).\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:527
+#: gfs2/mkfs/main_mkfs.c:509
#, c-format
msgid "No device specified. Use -h for help\n"
msgstr ""
#. Translators: gfs2 file systems are split into equal sized chunks called
#. resource groups. We're checking that the user gave a valid size for them.
-#: gfs2/mkfs/main_mkfs.c:537 gfs2/mkfs/main_mkfs.c:540
+#: gfs2/mkfs/main_mkfs.c:518
msgid "bad resource group size\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:544 gfs2/mkfs/main_jadd.c:190
+#: gfs2/mkfs/main_mkfs.c:521 gfs2/mkfs/main_jadd.c:190
msgid "no journals specified\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:547 gfs2/mkfs/main_jadd.c:192
+#: gfs2/mkfs/main_mkfs.c:524 gfs2/mkfs/main_jadd.c:192
msgid "bad journal size\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:550 gfs2/mkfs/main_jadd.c:194
+#: gfs2/mkfs/main_mkfs.c:527 gfs2/mkfs/main_jadd.c:194
msgid "bad quota change size\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:553
+#: gfs2/mkfs/main_mkfs.c:530
#, c-format
msgid "Stripe unit and stripe width must be specified together\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:561 gfs2/mkfs/main_grow.c:285
+#: gfs2/mkfs/main_mkfs.c:537 gfs2/mkfs/main_grow.c:313
msgid "Device:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:562
+#: gfs2/mkfs/main_mkfs.c:538
msgid "Block size:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:563 gfs2/mkfs/main_mkfs.c:697
+#: gfs2/mkfs/main_mkfs.c:539 gfs2/mkfs/main_mkfs.c:783
msgid "Device size:"
msgstr ""
#. Translators: "GB" here means "gigabytes"
-#: gfs2/mkfs/main_mkfs.c:565 gfs2/mkfs/main_mkfs.c:568
-#: gfs2/mkfs/main_mkfs.c:698
+#: gfs2/mkfs/main_mkfs.c:541 gfs2/mkfs/main_mkfs.c:544
+#: gfs2/mkfs/main_mkfs.c:784
msgid "GB"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:566 gfs2/mkfs/main_mkfs.c:569
-#: gfs2/mkfs/main_mkfs.c:699
+#: gfs2/mkfs/main_mkfs.c:542 gfs2/mkfs/main_mkfs.c:544
+#: gfs2/mkfs/main_mkfs.c:785
msgid "blocks"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:567
+#: gfs2/mkfs/main_mkfs.c:543
msgid "Filesystem size:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:570
+#: gfs2/mkfs/main_mkfs.c:545
msgid "Journals:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:571
+#: gfs2/mkfs/main_mkfs.c:546
msgid "Resource groups:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:572
+#: gfs2/mkfs/main_mkfs.c:547
msgid "Locking protocol:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:573
+#: gfs2/mkfs/main_mkfs.c:548
msgid "Lock table:"
msgstr ""
#. Translators: "UUID" = universally unique identifier.
-#: gfs2/mkfs/main_mkfs.c:575
+#: gfs2/mkfs/main_mkfs.c:551
msgid "UUID:"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:584
+#: gfs2/mkfs/main_mkfs.c:561
msgid "Failed to lstat the device"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:590
+#: gfs2/mkfs/main_mkfs.c:567
msgid "Could not find the absolute path of the device"
msgstr ""
#. Translators: Example: "/dev/vg/lv is a symbolic link to /dev/dm-2"
-#: gfs2/mkfs/main_mkfs.c:594
+#: gfs2/mkfs/main_mkfs.c:571
#, c-format
msgid "%s is a symbolic link to %s\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:597
+#: gfs2/mkfs/main_mkfs.c:574
#, c-format
msgid "This will destroy any data on %s\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:609
+#: gfs2/mkfs/main_mkfs.c:586
#, c-format
msgid "Stripe unit (%lu) must be a multiple of block size (%u)\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:613
+#: gfs2/mkfs/main_mkfs.c:590
#, c-format
msgid "Stripe width (%lu) must be a multiple of stripe unit (%lu)\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:630
+#: gfs2/mkfs/main_mkfs.c:607 gfs2/mkfs/main_grow.c:398
msgid "Could not initialise resource groups"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:654
+#: gfs2/mkfs/main_mkfs.c:629 gfs2/mkfs/main_grow.c:224
+msgid "Failed to write resource group"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:651
+msgid "Failed to create resource group index entry"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:660 gfs2/mkfs/main_grow.c:216
msgid "Failed to create resource group"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:659
-msgid "Failed to write resource group"
+#: gfs2/mkfs/main_mkfs.c:684
+#, c-format
+msgid "Placing resource group for journal%u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:694
+msgid "Failed to allocate space for bitmap buffer"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:704
+#, c-format
+msgid "Failed to allocate space for journal %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:719
+#, c-format
+msgid "Failed to write journal %u\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:725
+#, c-format
+msgid "Failed to write data blocks for journal %u\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:690
+#: gfs2/mkfs/main_mkfs.c:756 gfs2/mkfs/main_mkfs.c:920
+#: gfs2/fsck/rgrepair.c:636
+#, c-format
+msgid "Failed to build resource groups\n"
+msgstr ""
+
+#: gfs2/mkfs/main_mkfs.c:776
msgid "Failed to compute file system constants"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:696
+#: gfs2/mkfs/main_mkfs.c:782
#, c-format
msgid "Specified size is bigger than the device."
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:716 gfs2/mkfs/main_mkfs.c:721
+#: gfs2/mkfs/main_mkfs.c:800 gfs2/mkfs/main_mkfs.c:805
+#: gfs2/mkfs/main_grow.c:149 gfs2/mkfs/main_grow.c:160
#, c-format
msgid "Failed to create probe\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:727
+#: gfs2/mkfs/main_mkfs.c:811
#, c-format
msgid "Failed to probe device\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:735
+#: gfs2/mkfs/main_mkfs.c:819
#, c-format
msgid "It appears to contain an existing filesystem (%s)\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:737
+#: gfs2/mkfs/main_mkfs.c:821
#, c-format
msgid "It appears to contain a partition table (%s).\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:778
+#: gfs2/mkfs/main_mkfs.c:861
#, c-format
msgid "Device '%s' is too small\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:782
+#: gfs2/mkfs/main_mkfs.c:865
#, c-format
msgid "'%s' is not a block device or regular file\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:814
+#: gfs2/mkfs/main_mkfs.c:897
#, c-format
msgid "File system options:\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:837
+#: gfs2/mkfs/main_mkfs.c:927 gfs2/mkfs/main_mkfs.c:934
+#: gfs2/mkfs/main_mkfs.c:940 gfs2/mkfs/main_mkfs.c:945
+#: gfs2/mkfs/main_mkfs.c:951 gfs2/mkfs/main_mkfs.c:957
+#: gfs2/mkfs/main_mkfs.c:962
#, c-format
-msgid "Failed to build resource groups\n"
+msgid "Error building '%s': %s\n"
msgstr ""
-#: gfs2/mkfs/main_mkfs.c:845 gfs2/mkfs/main_mkfs.c:850
-#: gfs2/mkfs/main_mkfs.c:855 gfs2/mkfs/main_mkfs.c:861
-#: gfs2/mkfs/main_mkfs.c:867 gfs2/mkfs/main_mkfs.c:872
-#, c-format
-msgid "Error building '%s': %s\n"
+#: gfs2/mkfs/main_mkfs.c:984
+msgid "Failed to write superblock\n"
msgstr ""
#: gfs2/mkfs/main.c:51
msgid "Unknown mode\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:67
+#: gfs2/mkfs/main_grow.c:70
msgid "Display this usage information"
msgstr ""
-#: gfs2/mkfs/main_grow.c:68
+#: gfs2/mkfs/main_grow.c:71
msgid "Quiet, reduce verbosity"
msgstr ""
-#: gfs2/mkfs/main_grow.c:69
+#: gfs2/mkfs/main_grow.c:72
msgid "Do everything except update file system"
msgstr ""
-#: gfs2/mkfs/main_grow.c:70
+#: gfs2/mkfs/main_grow.c:73
msgid "Display version information"
msgstr ""
-#: gfs2/mkfs/main_grow.c:71
+#: gfs2/mkfs/main_grow.c:74
msgid "Increase verbosity"
msgstr ""
-#: gfs2/mkfs/main_grow.c:77
+#: gfs2/mkfs/main_grow.c:80
#, c-format
msgid ""
"Expands a GFS2 file system after the device containing the file system has "
"been expanded"
msgstr ""
-#: gfs2/mkfs/main_grow.c:99
+#: gfs2/mkfs/main_grow.c:102
#, c-format
msgid "%s %s (built %s %s)\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:110
+#: gfs2/mkfs/main_grow.c:113
#, c-format
msgid "(Test mode - file system will not be changed)\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:123
+#: gfs2/mkfs/main_grow.c:126
#, c-format
msgid "Invalid option '%c'\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:211
+#: gfs2/mkfs/main_grow.c:155
+#, c-format
+msgid "fstat failed\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:262
#, c-format
msgid "%d new rindex entries.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:238
+#: gfs2/mkfs/main_grow.c:269
#, c-format
-msgid "Incorrect rindex size. want %ld(%d resource groups), have %ld\n"
+msgid "Incorrect rindex size. Want %ld (%d resource groups), have %ld\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:248
+#: gfs2/mkfs/main_grow.c:277
msgid "Error writing first new rindex entry; aborted.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:257
+#: gfs2/mkfs/main_grow.c:285
msgid "Error writing new rindex entries; aborted.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:272
+#: gfs2/mkfs/main_grow.c:300
#, c-format
msgid "truncating rindex to %ld entries\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:284
+#: gfs2/mkfs/main_grow.c:312
msgid "Mount point:"
msgstr ""
-#: gfs2/mkfs/main_grow.c:286
+#: gfs2/mkfs/main_grow.c:314
msgid "Size:"
msgstr ""
-#: gfs2/mkfs/main_grow.c:288
-msgid "Resource group size:"
+#: gfs2/mkfs/main_grow.c:316
+msgid "New resource group size:"
msgstr ""
-#: gfs2/mkfs/main_grow.c:289
+#: gfs2/mkfs/main_grow.c:317
msgid "Length:"
msgstr ""
-#: gfs2/mkfs/main_grow.c:292
+#: gfs2/mkfs/main_grow.c:320
#, c-format
-msgid "The file system grew by %lluMB.\n"
+msgid "The file system will grow by %lluMB.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:361 gfs2/fsck/initialize.c:1257
-msgid "Initializing lists...\n"
+#: gfs2/mkfs/main_grow.c:349 gfs2/mkfs/main_jadd.c:502
+#, c-format
+msgid "Error looking up mount '%s': %s\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:368 gfs2/mkfs/main_jadd.c:522
+#: gfs2/mkfs/main_grow.c:353 gfs2/mkfs/main_jadd.c:506
+#, c-format
+msgid "%s: not a mounted gfs2 file system\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:366 gfs2/mkfs/main_jadd.c:520
msgid "Bad constants (1)"
msgstr ""
-#: gfs2/mkfs/main_grow.c:372
+#: gfs2/mkfs/main_grow.c:370
+#, c-format
msgid "Error reading superblock.\n"
msgstr ""
#: gfs2/mkfs/main_grow.c:374
+#, c-format
msgid "cannot grow gfs1 filesystem\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:378
+#: gfs2/mkfs/main_grow.c:379
msgid "Failed to mount GFS2 meta file system"
msgstr ""
-#: gfs2/mkfs/main_grow.c:386
-msgid "GFS2 rindex not found. Please run fsck.gfs2.\n"
+#: gfs2/mkfs/main_grow.c:387
+msgid "GFS2 rindex not found. Please run fsck.gfs2.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:391
+#: gfs2/mkfs/main_grow.c:393
msgid "Could not read master directory"
msgstr ""
-#: gfs2/mkfs/main_grow.c:403
-msgid "Error: No resource groups found.\n"
+#: gfs2/mkfs/main_grow.c:407
+#, c-format
+msgid "Gathering resource group information for %s\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:412
-msgid "Error: The device has grown by less than one resource group.\n"
+#: gfs2/mkfs/main_grow.c:410
+msgid "Failed to scan existing resource groups"
msgstr ""
-#: gfs2/mkfs/main_grow.c:414
-#, c-format
-msgid "The device grew by %lluMB. "
+#: gfs2/mkfs/main_grow.c:422
+msgid "Could not initialise new resource groups"
msgstr ""
-#: gfs2/mkfs/main_grow.c:416
+#: gfs2/mkfs/main_grow.c:429
+msgid "The calculated resource group size is too small.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:430
#, c-format
-msgid "One resource group is %uMB for this file system.\n"
+msgid "%s has not grown.\n"
msgstr ""
-#: gfs2/mkfs/main_grow.c:438
+#: gfs2/mkfs/main_grow.c:452
+msgid "gfs2_grow interrupted.\n"
+msgstr ""
+
+#: gfs2/mkfs/main_grow.c:455
msgid "gfs2_grow complete.\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:91
+#: gfs2/mkfs/main_jadd.c:94
msgid "Display version information, then exit"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:97
+#: gfs2/mkfs/main_jadd.c:100
#, c-format
msgid "Adds journals to a GFS2 file system."
msgstr ""
-#: gfs2/mkfs/main_jadd.c:171
+#: gfs2/mkfs/main_jadd.c:172
msgid "no path specified (try -h for help)\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:174
+#: gfs2/mkfs/main_jadd.c:175
#, c-format
msgid "Unrecognized argument: %s\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:177
+#: gfs2/mkfs/main_jadd.c:178
#, c-format
msgid "Command Line Arguments:\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:212
-#, c-format
-msgid "Expert mode: on\n"
-msgstr ""
-
-#: gfs2/mkfs/main_jadd.c:214
+#: gfs2/mkfs/main_jadd.c:210
#, c-format
msgid "Filesystem: %s\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:215
+#: gfs2/mkfs/main_jadd.c:211
#, c-format
msgid "Old Journals: %u\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:216
+#: gfs2/mkfs/main_jadd.c:212
#, c-format
msgid "New Journals: %u\n"
msgstr ""
-#: gfs2/mkfs/main_jadd.c:406
+#: gfs2/mkfs/main_jadd.c:402
msgid "No journals found. Did you run mkfs.gfs2 correctly?\n"
msgstr ""
@@ -689,509 +740,524 @@ msgstr ""
msgid "File system UUID: %s\n"
msgstr ""
-#: gfs2/tune/super.c:129
+#: gfs2/tune/super.c:130
#, c-format
msgid "File system magic number: 0x%X\n"
msgstr ""
-#: gfs2/tune/super.c:130
+#: gfs2/tune/super.c:131
#, c-format
msgid "Block size: %d\n"
msgstr ""
-#: gfs2/tune/super.c:131
+#: gfs2/tune/super.c:132
#, c-format
msgid "Block shift: %d\n"
msgstr ""
-#: gfs2/tune/super.c:132
+#: gfs2/tune/super.c:133
#, c-format
msgid "Root inode: %llu\n"
msgstr ""
-#: gfs2/tune/super.c:134
+#: gfs2/tune/super.c:135
#, c-format
msgid "Master inode: %llu\n"
msgstr ""
-#: gfs2/tune/super.c:135
+#: gfs2/tune/super.c:136
#, c-format
msgid "Lock protocol: %s\n"
msgstr ""
-#: gfs2/tune/super.c:136
+#: gfs2/tune/super.c:137
#, c-format
msgid "Lock table: %s\n"
msgstr ""
-#: gfs2/tune/super.c:167 gfs2/tune/super.c:186
+#: gfs2/tune/super.c:168 gfs2/tune/super.c:187
msgid "too long"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:563
+#: gfs2/convert/gfs2_convert.c:516
msgid "Error: Can't allocate memory for indirect block fix\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:570 gfs2/convert/gfs2_convert.c:605
-#: gfs2/convert/gfs2_convert.c:705
+#: gfs2/convert/gfs2_convert.c:523 gfs2/convert/gfs2_convert.c:558
+#: gfs2/convert/gfs2_convert.c:658
msgid "Error: Can't allocate memory for file conversion.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:598 gfs2/convert/gfs2_convert.c:699
+#: gfs2/convert/gfs2_convert.c:551 gfs2/convert/gfs2_convert.c:652
msgid "Error: Can't allocate memory for indirect block fix.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:844 gfs2/convert/gfs2_convert.c:879
-#: gfs2/convert/gfs2_convert.c:926
+#: gfs2/convert/gfs2_convert.c:797 gfs2/convert/gfs2_convert.c:832
+#: gfs2/convert/gfs2_convert.c:879
msgid "Error: out of memory.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:908 gfs2/fsck/initialize.c:871
-#: gfs2/fsck/initialize.c:998
+#: gfs2/convert/gfs2_convert.c:861 gfs2/fsck/initialize.c:899
+#: gfs2/fsck/initialize.c:1026
#, c-format
msgid "Error reading inode: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1070
+#: gfs2/convert/gfs2_convert.c:1023
msgid "Converting inodes.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1089 gfs2/convert/gfs2_convert.c:1144
+#: gfs2/convert/gfs2_convert.c:1042 gfs2/convert/gfs2_convert.c:1098
#, c-format
msgid "\r%llu inodes from %d rgs converted."
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1187
+#: gfs2/convert/gfs2_convert.c:1141
msgid "Error retrieving directory.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1212 gfs2/convert/gfs2_convert.c:2246
+#: gfs2/convert/gfs2_convert.c:1166 gfs2/convert/gfs2_convert.c:2218
#, c-format
msgid "\r%llu directories, %llu dirents fixed."
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1223
+#: gfs2/convert/gfs2_convert.c:1177
#, c-format
msgid "Error retrieving inode 0x%llx\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1317
+#: gfs2/convert/gfs2_convert.c:1271
msgid "fix_one_directory_exhash: error reading directory.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1333
+#: gfs2/convert/gfs2_convert.c:1287
#, c-format
msgid "Error reading leaf %llx\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1363
+#: gfs2/convert/gfs2_convert.c:1317
msgid "Error fixing exhash directory.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1370
+#: gfs2/convert/gfs2_convert.c:1324
msgid "Error fixing linear directory.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1397
+#: gfs2/convert/gfs2_convert.c:1351
msgid ""
"\n"
"Fixing file and directory information.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1412
+#: gfs2/convert/gfs2_convert.c:1366
msgid "Error processing directory\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1448 gfs2/convert/gfs2_convert.c:1454
+#: gfs2/convert/gfs2_convert.c:1402 gfs2/convert/gfs2_convert.c:1408
#, c-format
msgid "Error retrieving inode at block %llx\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1472
+#: gfs2/convert/gfs2_convert.c:1429
msgid "Error trying to fix cdpn dentry\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1506
+#: gfs2/convert/gfs2_convert.c:1463
msgid ""
"The size reported in the journal index inode is not a\n"
"\tmultiple of the size of a journal index.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1512 gfs2/fsck/fs_recovery.c:653
+#: gfs2/convert/gfs2_convert.c:1469 gfs2/fsck/fs_recovery.c:742
msgid "Unable to allocate journal index\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1516
+#: gfs2/convert/gfs2_convert.c:1473
msgid "Unable to zero journal index\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1535 gfs2/fsck/fs_recovery.c:665
+#: gfs2/convert/gfs2_convert.c:1492 gfs2/fsck/fs_recovery.c:754
msgid "An error occurred while reading the journal index file.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1545
+#: gfs2/convert/gfs2_convert.c:1502
msgid "journal inode size invalid\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1594 gfs2/convert/gfs2_convert.c:1616
-#: gfs2/convert/gfs2_convert.c:1622 gfs2/convert/gfs2_convert.c:1633
-#: gfs2/convert/gfs2_convert.c:1639 gfs2/convert/gfs2_convert.c:2282
+#: gfs2/convert/gfs2_convert.c:1517
+msgid "Error: Superblock Quota inode address is NULL\n"
+msgstr ""
+
+#: gfs2/convert/gfs2_convert.c:1521
+msgid "Error: Superblock Statfs inode address is NULL\n"
+msgstr ""
+
+#: gfs2/convert/gfs2_convert.c:1525
+msgid "Error: Superblock segment size is zero\n"
+msgstr ""
+
+#: gfs2/convert/gfs2_convert.c:1569 gfs2/convert/gfs2_convert.c:1591
+#: gfs2/convert/gfs2_convert.c:1597 gfs2/convert/gfs2_convert.c:1608
+#: gfs2/convert/gfs2_convert.c:1614 gfs2/convert/gfs2_convert.c:2254
msgid "Error: Bad constants (1)\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1650
+#: gfs2/convert/gfs2_convert.c:1625
#, c-format
msgid "Error: %s does not look like a gfs1 filesystem.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1659
+#: gfs2/convert/gfs2_convert.c:1634
#, c-format
msgid "Could not read resource group index: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1666
+#: gfs2/convert/gfs2_convert.c:1641
#, c-format
msgid "Could not read journal index: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1680
+#: gfs2/convert/gfs2_convert.c:1655
#, c-format
msgid "Examining file system"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1682
+#: gfs2/convert/gfs2_convert.c:1657
msgid "Unable to fill in resource group information.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1689
+#: gfs2/convert/gfs2_convert.c:1664
#, c-format
msgid "%d rgs found.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1698
+#: gfs2/convert/gfs2_convert.c:1673
#, c-format
msgid "This program will convert a gfs1 filesystem to a gfs2 filesystem.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1700
+#: gfs2/convert/gfs2_convert.c:1675
#, c-format
msgid ""
"WARNING: This can't be undone. It is strongly advised that you:\n"
"\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1702
+#: gfs2/convert/gfs2_convert.c:1677
#, c-format
msgid " 1. Back up your entire filesystem first.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1703
+#: gfs2/convert/gfs2_convert.c:1678
#, c-format
msgid " 2. Run fsck.gfs2 first to ensure filesystem integrity.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1704
+#: gfs2/convert/gfs2_convert.c:1679
#, c-format
msgid " 3. Make sure the filesystem is NOT mounted from any node.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1705
+#: gfs2/convert/gfs2_convert.c:1680
#, c-format
msgid " 4. Make sure you have the latest software versions.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1713
+#: gfs2/convert/gfs2_convert.c:1688
#, c-format
msgid "gfs2_convert version %s (built %s %s)\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1724
+#: gfs2/convert/gfs2_convert.c:1699
#, c-format
msgid ""
"\n"
"Usage:\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1725
+#: gfs2/convert/gfs2_convert.c:1700
#, c-format
msgid ""
"%s [-hnqvVy] <device>\n"
"\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1727
+#: gfs2/convert/gfs2_convert.c:1702
#, c-format
msgid "\th - print this help message\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1728
+#: gfs2/convert/gfs2_convert.c:1703
#, c-format
msgid "\tn - assume 'no' to all questions\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1729
+#: gfs2/convert/gfs2_convert.c:1704
#, c-format
msgid "\tq - quieter output\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1730
+#: gfs2/convert/gfs2_convert.c:1705
#, c-format
msgid "\tv - more verbose output\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1731
+#: gfs2/convert/gfs2_convert.c:1706
#, c-format
msgid "\tV - print version information\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1732
+#: gfs2/convert/gfs2_convert.c:1707
#, c-format
msgid "\ty - assume 'yes' to all questions\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1772
+#: gfs2/convert/gfs2_convert.c:1747
#, c-format
msgid "Parameter not understood: %c\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1781 gfs2/convert/gfs2_convert.c:1785
+#: gfs2/convert/gfs2_convert.c:1756 gfs2/convert/gfs2_convert.c:1760
#, c-format
msgid "No device specified. Please use '-h' for help\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1836
+#: gfs2/convert/gfs2_convert.c:1811
msgid "Converting journal space to rg space.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1858
+#: gfs2/convert/gfs2_convert.c:1833
msgid "Error: No suitable rg found for journal.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1861
+#: gfs2/convert/gfs2_convert.c:1836
#, c-format
msgid "Addr 0x%llx comes after rg at addr 0x%llx\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1902
+#: gfs2/convert/gfs2_convert.c:1864
msgid "gfs2_convert: Error converting bitmaps.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1932
+#: gfs2/convert/gfs2_convert.c:1898
#, c-format
msgid ""
"\n"
"Next Inum: %llu\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:1964
+#: gfs2/convert/gfs2_convert.c:1930
msgid "Removing obsolete GFS1 file system structures.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2004
+#: gfs2/convert/gfs2_convert.c:1970
#, c-format
msgid "Writing journal #%d..."
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2012
+#: gfs2/convert/gfs2_convert.c:1978
#, c-format
msgid "done.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2131
+#: gfs2/convert/gfs2_convert.c:2092
#, c-format
msgid "Couldn't lookup new quota file: %d\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2138
+#: gfs2/convert/gfs2_convert.c:2099
#, c-format
msgid "Couldn't lookup old quota file: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2171
+#: gfs2/convert/gfs2_convert.c:2132
#, c-format
msgid "Convert %s from GFS1 to GFS2? (y/n)"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2182
+#: gfs2/convert/gfs2_convert.c:2143
#, c-format
msgid "Bad response '%s', please type 'y' or 'n'.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2212
+#: gfs2/convert/gfs2_convert.c:2172
+#, c-format
+msgid ""
+"%s is not a clean gfs filesytem. Please use the fsck.gfs2 utility to correct "
+"these errors and try again.\n"
+msgstr ""
+
+#: gfs2/convert/gfs2_convert.c:2184
#, c-format
msgid "%s not converted.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2221
+#: gfs2/convert/gfs2_convert.c:2193
msgid "Converting resource groups."
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2226
+#: gfs2/convert/gfs2_convert.c:2198
#, c-format
msgid "%s: Unable to convert resource groups.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2238
+#: gfs2/convert/gfs2_convert.c:2210
#, c-format
msgid ""
"\n"
"%s: Error renumbering inodes.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2251
+#: gfs2/convert/gfs2_convert.c:2223
#, c-format
msgid ""
"\n"
"%s: Error fixing directories.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2258
+#: gfs2/convert/gfs2_convert.c:2230
#, c-format
msgid "\r%llu cdpn symlinks moved to empty directories."
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2262
+#: gfs2/convert/gfs2_convert.c:2234
#, c-format
msgid ""
"\n"
"%s: Error fixing cdpn symlinks.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2268
+#: gfs2/convert/gfs2_convert.c:2240
msgid ""
"\n"
"Converting journals.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2271
+#: gfs2/convert/gfs2_convert.c:2243
#, c-format
msgid "%s: Error converting journal space.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2293
+#: gfs2/convert/gfs2_convert.c:2265
#, c-format
msgid ""
"Reduced journal size to %u MB to accommodate GFS2 file system structures.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2301
+#: gfs2/convert/gfs2_convert.c:2273
#, c-format
msgid "Error: could not build jindex: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2304
+#: gfs2/convert/gfs2_convert.c:2276
msgid "Building GFS2 file system structures.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2308
+#: gfs2/convert/gfs2_convert.c:2280
#, c-format
msgid "Error building per-node directories: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2315
+#: gfs2/convert/gfs2_convert.c:2287
#, c-format
msgid "Error building inum inode: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2323
+#: gfs2/convert/gfs2_convert.c:2295
#, c-format
msgid "Error building statfs inode: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2333
+#: gfs2/convert/gfs2_convert.c:2305
#, c-format
msgid "Error building rindex inode: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2340
+#: gfs2/convert/gfs2_convert.c:2312
#, c-format
msgid "Error building quota inode: %s\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2368
+#: gfs2/convert/gfs2_convert.c:2340
msgid "Committing changes to disk.\n"
msgstr ""
-#: gfs2/convert/gfs2_convert.c:2384
+#: gfs2/convert/gfs2_convert.c:2357
#, c-format
msgid "%s: filesystem converted successfully to gfs2.\n"
msgstr ""
-#: gfs2/fsck/inode_hash.c:51
+#: gfs2/fsck/inode_hash.c:52
msgid "Unable to allocate inode_info structure\n"
msgstr ""
-#: gfs2/fsck/inode_hash.c:55
-msgid "Error while zeroing inode_info structure\n"
-msgstr ""
-
-#: gfs2/fsck/initialize.c:114
+#: gfs2/fsck/initialize.c:115
msgid "Freeing buffers.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:144
+#: gfs2/fsck/initialize.c:145
msgid "Setting block ranges...\n"
msgstr ""
-#: gfs2/fsck/initialize.c:159
+#: gfs2/fsck/initialize.c:160
msgid "This file system is too big for this computer to handle.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:160
+#: gfs2/fsck/initialize.c:161
#, c-format
msgid "Last fs block = 0x%llx, but sizeof(unsigned long) is %zu bytes.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:170
+#: gfs2/fsck/initialize.c:171
#, c-format
msgid "Can't seek to last block in file system: %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:179
+#: gfs2/fsck/initialize.c:180
#, c-format
msgid ""
"Can't read last block in file system (error %u), last_fs_block: %llu (0x"
"%llx)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:252
+#: gfs2/fsck/initialize.c:253
#, c-format
msgid "Free metadata block 0x%llx found.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:256
+#: gfs2/fsck/initialize.c:257
#, c-format
msgid "Unlinked dinode 0x%llx found.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:264
+#: gfs2/fsck/initialize.c:265
#, c-format
msgid "Okay to reclaim free metadata in resource group %lld (0x%llx)? (y/n)"
msgstr ""
-#: gfs2/fsck/initialize.c:285
+#: gfs2/fsck/initialize.c:286
#, c-format
msgid "Free metadata block %lld (0x%llx) reclaimed.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:296
+#: gfs2/fsck/initialize.c:297
#, c-format
msgid "%lld blocks (total) may need to be freed in pass 5.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:320
+#: gfs2/fsck/initialize.c:321
#, c-format
msgid "The rgrp at %lld (0x%llx) was cleaned of %d free metadata blocks.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:329
+#: gfs2/fsck/initialize.c:330
#, c-format
msgid ""
"Error: resource group %lld (0x%llx): free space (%d) does not match bitmap "
"(%d)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:334
+#: gfs2/fsck/initialize.c:335
msgid "Fix the rgrp free blocks count? (y/n)"
msgstr ""
@@ -1248,691 +1314,736 @@ msgstr ""
msgid "Trying to rebuild the master directory.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:436
+#: gfs2/fsck/initialize.c:438
#, c-format
msgid "Error reading master: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:447
+#: gfs2/fsck/initialize.c:449
#, c-format
msgid "Error %d adding jindex directory\n"
msgstr ""
-#: gfs2/fsck/initialize.c:454
+#: gfs2/fsck/initialize.c:456
#, c-format
msgid "Error %d building jindex\n"
msgstr ""
-#: gfs2/fsck/initialize.c:465
+#: gfs2/fsck/initialize.c:467
#, c-format
msgid "Error %d adding per_node directory\n"
msgstr ""
-#: gfs2/fsck/initialize.c:473
+#: gfs2/fsck/initialize.c:475
#, c-format
msgid "Error %d building per_node directory\n"
msgstr ""
-#: gfs2/fsck/initialize.c:485
+#: gfs2/fsck/initialize.c:487
#, c-format
msgid "Error %d adding inum inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:491
+#: gfs2/fsck/initialize.c:493
#, c-format
msgid "Error %d building inum inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:503
+#: gfs2/fsck/initialize.c:505
#, c-format
msgid "Error %d adding statfs inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:509
+#: gfs2/fsck/initialize.c:511
#, c-format
msgid "Error %d building statfs inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:521
+#: gfs2/fsck/initialize.c:523
#, c-format
msgid "Error %d adding rindex inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:527
+#: gfs2/fsck/initialize.c:529
#, c-format
msgid "Error %d building rindex inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:538
+#: gfs2/fsck/initialize.c:540
#, c-format
msgid "Error %d adding quota inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:544
+#: gfs2/fsck/initialize.c:546
#, c-format
msgid "Error %d building quota inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:549
+#: gfs2/fsck/initialize.c:551
msgid "Master directory rebuilt.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:578
+#: gfs2/fsck/initialize.c:580
msgid ""
"The gfs2 system per_node directory inode is missing, so we might not be \n"
"able to rebuild missing journals this run.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:584
+#: gfs2/fsck/initialize.c:586
msgid ""
"The gfs2 system per_node directory inode is missing. Okay to rebuild it? (y/"
"n) "
msgstr ""
-#: gfs2/fsck/initialize.c:590
+#: gfs2/fsck/initialize.c:592
#, c-format
msgid "Error %d rebuilding per_node directory\n"
msgstr ""
-#: gfs2/fsck/initialize.c:597
+#: gfs2/fsck/initialize.c:599
msgid "Unable to rebuild per_node; aborting.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:611
+#: gfs2/fsck/initialize.c:613
msgid "Checking if all rgrp and rindex values are good"
msgstr ""
-#: gfs2/fsck/initialize.c:612
+#: gfs2/fsck/initialize.c:614
msgid "Checking if rindex values may be easily repaired"
msgstr ""
-#: gfs2/fsck/initialize.c:613
+#: gfs2/fsck/initialize.c:615
msgid "Calculating where the rgrps should be if evenly spaced"
msgstr ""
-#: gfs2/fsck/initialize.c:614
+#: gfs2/fsck/initialize.c:616
msgid "Trying to rebuild rindex assuming evenly spaced rgrps"
msgstr ""
-#: gfs2/fsck/initialize.c:615
+#: gfs2/fsck/initialize.c:617
msgid "Trying to rebuild rindex assuming unevenly spaced rgrps"
msgstr ""
-#: gfs2/fsck/initialize.c:618
+#: gfs2/fsck/initialize.c:620
msgid "Some damage was found; we need to take remedial measures"
msgstr ""
-#: gfs2/fsck/initialize.c:619
+#: gfs2/fsck/initialize.c:621
msgid "rindex is unevenly spaced: either gfs1-style or corrupt"
msgstr ""
-#: gfs2/fsck/initialize.c:620
+#: gfs2/fsck/initialize.c:622
msgid "rindex calculations don't match: uneven rgrp boundaries"
msgstr ""
-#: gfs2/fsck/initialize.c:621
+#: gfs2/fsck/initialize.c:623
msgid "Too many rgrp misses: rgrps must be unevenly spaced"
msgstr ""
-#: gfs2/fsck/initialize.c:622
+#: gfs2/fsck/initialize.c:624
msgid "Too much damage found: we cannot rebuild this rindex"
msgstr ""
-#: gfs2/fsck/initialize.c:627
+#: gfs2/fsck/initialize.c:629
msgid "Validating Resource Group index.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:631
+#: gfs2/fsck/initialize.c:633
#, c-format
msgid "Level %d rgrp check: %s.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:635
+#: gfs2/fsck/initialize.c:637
#, c-format
msgid "(level %d passed)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:639
+#: gfs2/fsck/initialize.c:641
#, c-format
msgid "(level %d failed: %s)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:642
+#: gfs2/fsck/initialize.c:644
#, c-format
msgid "(level %d failed at block %lld (0x%llx): %s)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:652
+#: gfs2/fsck/initialize.c:654
msgid "Resource Group recovery impossible; I can't fix this file system.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:656
+#: gfs2/fsck/initialize.c:658
#, c-format
msgid "%u resource groups found.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:679
+#: gfs2/fsck/initialize.c:681
msgid "Initializing special inodes...\n"
msgstr ""
-#: gfs2/fsck/initialize.c:697
+#: gfs2/fsck/initialize.c:699
msgid "The gfs2 system inum inode is missing. Okay to rebuild it? (y/n) "
msgstr ""
-#: gfs2/fsck/initialize.c:699
+#: gfs2/fsck/initialize.c:701
msgid "fsck.gfs2 cannot continue without a valid inum file; aborting.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:705
+#: gfs2/fsck/initialize.c:707
#, c-format
msgid "Error %d rebuilding inum inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:721
+#: gfs2/fsck/initialize.c:723
#, c-format
msgid "Error %d reading system inum inode. Aborting.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:732
+#: gfs2/fsck/initialize.c:735
+msgid ""
+"The gfs system statfs inode pointer is incorrect. Okay to correct? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/initialize.c:737 gfs2/fsck/initialize.c:755
+#: gfs2/fsck/initialize.c:767
+msgid "fsck.gfs2 cannot continue without a valid statfs file; aborting.\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:747
#, c-format
msgid "Error reading statfs inode: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:738
+#: gfs2/fsck/initialize.c:753
msgid "The gfs2 system statfs inode is missing. Okay to rebuild it? (y/n) "
msgstr ""
-#: gfs2/fsck/initialize.c:740 gfs2/fsck/initialize.c:752
-msgid "fsck.gfs2 cannot continue without a valid statfs file; aborting.\n"
-msgstr ""
-
-#: gfs2/fsck/initialize.c:746
+#: gfs2/fsck/initialize.c:761
#, c-format
msgid "Error %d rebuilding statfs inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:751
+#: gfs2/fsck/initialize.c:766
msgid "Rebuild of statfs system file failed."
msgstr ""
-#: gfs2/fsck/initialize.c:764
+#: gfs2/fsck/initialize.c:779
#, c-format
msgid "Error %d reading statfs file. Aborting.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:778
+#: gfs2/fsck/initialize.c:794
+msgid ""
+"The gfs system quota inode pointer is incorrect. Okay to correct? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/initialize.c:796
+msgid "fsck.gfs2 cannot continue without a valid quota file; aborting.\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:806
#, c-format
msgid "Error reading quota inode: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:784
+#: gfs2/fsck/initialize.c:812
msgid "The gfs2 system quota inode is missing. Okay to rebuild it? (y/n) "
msgstr ""
-#: gfs2/fsck/initialize.c:792
+#: gfs2/fsck/initialize.c:820
#, c-format
msgid "Error %d rebuilding quota inode\n"
msgstr ""
-#: gfs2/fsck/initialize.c:812
+#: gfs2/fsck/initialize.c:840
msgid "Unable to determine the boundaries of the file system.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:819
+#: gfs2/fsck/initialize.c:847
msgid ""
"This system doesn't have enough memory and swap space to fsck this file "
"system.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:820
+#: gfs2/fsck/initialize.c:848
#, c-format
msgid "Additional memory needed is approximately: %lluMB\n"
msgstr ""
-#: gfs2/fsck/initialize.c:822
+#: gfs2/fsck/initialize.c:850
msgid ""
"Please increase your swap space by that amount and run gfs2_fsck again.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:864
+#: gfs2/fsck/initialize.c:892
#, c-format
msgid "Found system master directory at: 0x%llx.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:879
+#: gfs2/fsck/initialize.c:907
#, c-format
msgid "Found system jindex file at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:893 gfs2/fsck/initialize.c:1211
+#: gfs2/fsck/initialize.c:921 gfs2/fsck/initialize.c:1239
#, c-format
msgid "Found system master directory at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:905
+#: gfs2/fsck/initialize.c:933
#, c-format
msgid "Found system per_node directory at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:912
+#: gfs2/fsck/initialize.c:940
#, c-format
msgid "From per_node's '..' I backtracked the master directory to: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:918
+#: gfs2/fsck/initialize.c:946
#, c-format
msgid "Unknown system directory at block 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:925
+#: gfs2/fsck/initialize.c:953
#, c-format
msgid "Found system inum file at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:931
+#: gfs2/fsck/initialize.c:959
#, c-format
msgid "Found system statfs file at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:937
+#: gfs2/fsck/initialize.c:965
#, c-format
msgid "Found system rindex file at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:945
+#: gfs2/fsck/initialize.c:973
#, c-format
msgid "Found system quota file at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:973
+#: gfs2/fsck/initialize.c:1001
#, c-format
msgid "Found the root directory at: 0x%llx.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:978
+#: gfs2/fsck/initialize.c:1006
#, c-format
msgid ""
"The root dinode should be at block 0x%llx but it seems to be destroyed.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:981
+#: gfs2/fsck/initialize.c:1009
#, c-format
msgid "Found a copy of the root directory in a journal at block: 0x%llx.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:984
+#: gfs2/fsck/initialize.c:1012
msgid "Do you want to replace the root dinode from the copy? (y/n)"
msgstr ""
-#: gfs2/fsck/initialize.c:986
+#: gfs2/fsck/initialize.c:1014
msgid "Damaged root dinode not fixed.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:993
+#: gfs2/fsck/initialize.c:1021
msgid "Root directory copied from the journal.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1005 gfs2/fsck/initialize.c:1221
+#: gfs2/fsck/initialize.c:1033 gfs2/fsck/initialize.c:1249
#, c-format
msgid "Found the root directory at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1021 gfs2/fsck/initialize.c:1182
+#: gfs2/fsck/initialize.c:1049 gfs2/fsck/initialize.c:1209
#, c-format
msgid "Found a possible root at: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1075
+#: gfs2/fsck/initialize.c:1103
#, c-format
msgid "boff:%d bsize2:%d rg:0x%llx, rb:0x%llx\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1090
+#: gfs2/fsck/initialize.c:1118
#, c-format
msgid "Block size determined to be: %d\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1139
+#: gfs2/fsck/initialize.c:1166
msgid ""
"Gathering information to repair the gfs2 superblock. This may take some "
"time.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1146
+#: gfs2/fsck/initialize.c:1173
msgid "Block size not apparent; checking elsewhere.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1158
+#: gfs2/fsck/initialize.c:1185
msgid ""
"Unable to determine the block size; this does not look like a gfs2 file "
"system.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1168
+#: gfs2/fsck/initialize.c:1195
msgid "Unable to locate the system master directory.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1174
+#: gfs2/fsck/initialize.c:1201
msgid "Unable to locate the root directory.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1178
+#: gfs2/fsck/initialize.c:1205
msgid "Can't find any dinodes that might be the root; using master - 1.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1190
+#: gfs2/fsck/initialize.c:1217
msgid "The root dinode block is destroyed.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1191
+#: gfs2/fsck/initialize.c:1218
msgid ""
"At this point I recommend reinitializing it.\n"
"Hopefully everything will later be put into lost+found.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1195
+#: gfs2/fsck/initialize.c:1222
msgid "Okay to reinitialize the root dinode? (y/n)"
msgstr ""
-#: gfs2/fsck/initialize.c:1197
+#: gfs2/fsck/initialize.c:1224
msgid "The root dinode was not reinitialized; aborting.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1210
+#: gfs2/fsck/initialize.c:1237
msgid "Okay to fix the GFS2 superblock? (y/n)"
msgstr ""
-#: gfs2/fsck/initialize.c:1216
+#: gfs2/fsck/initialize.c:1244
#, c-format
msgid "Error reading master inode: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1226
+#: gfs2/fsck/initialize.c:1254
#, c-format
msgid "Error reading root inode: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1235
+#: gfs2/fsck/initialize.c:1267
msgid ""
"GFS2 superblock not fixed; fsck cannot proceed without a valid superblock.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1267
+#: gfs2/fsck/initialize.c:1289
+msgid "Initializing lists...\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1299
msgid "GFS superblock is larger than the blocksize!\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1273
+#: gfs2/fsck/initialize.c:1305
msgid "Bad constants (1)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1368
+#: gfs2/fsck/initialize.c:1395
+#, c-format
+msgid "Computed correct journal segment size to %u. Reset it? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1397
+msgid "Error: Cannot proceed without a valid journal segment size value.\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1401
+#, c-format
+msgid "Resetting journal segment size to %u\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1415 gfs2/fsck/initialize.c:1442
+#, c-format
+msgid "Error %d reading system journal index inode. Aborting\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1423
+msgid ""
+"The gfs2 journal segment size is 0 and a correct value cannot be determined "
+"in a single-journal filesystem.\n"
+"Continue with default? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1427
+msgid "Error: Cannot proceed without a valid sb_seg_size value.\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1467
+msgid "Failed to set correct journal segment size. Cannot continue\n"
+msgstr ""
+
+#: gfs2/fsck/initialize.c:1471
msgid "Clearing GFS journals (this may take a while)\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1381
+#: gfs2/fsck/initialize.c:1484
msgid ""
"\n"
"Journals cleared.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1400
+#: gfs2/fsck/initialize.c:1503
msgid "The gfs2 system rindex inode is missing. Okay to rebuild it? (y/n) "
msgstr ""
-#: gfs2/fsck/initialize.c:1402
+#: gfs2/fsck/initialize.c:1505
msgid "Error: Cannot proceed without a valid rindex.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1406
+#: gfs2/fsck/initialize.c:1509
#, c-format
msgid "Error %d rebuilding rindex\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1431
+#: gfs2/fsck/initialize.c:1534
msgid "The gfs2 system jindex inode is missing. Okay to rebuild it? (y/n) "
msgstr ""
-#: gfs2/fsck/initialize.c:1433
+#: gfs2/fsck/initialize.c:1536
msgid "Error: cannot proceed without a valid jindex file.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1447
+#: gfs2/fsck/initialize.c:1550
#, c-format
msgid "Error %d rebuilding jindex\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1454
+#: gfs2/fsck/initialize.c:1557
msgid "Unable to read in jindex inode.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1481
+#: gfs2/fsck/initialize.c:1583
#, c-format
msgid "Unable to open device: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1527
+#: gfs2/fsck/initialize.c:1622
msgid "Unable to block other mounters\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1547
+#: gfs2/fsck/initialize.c:1642
#, c-format
msgid "Error reading master directory: %s\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1583
+#: gfs2/fsck/initialize.c:1678
msgid ""
"\n"
"Journal recovery complete.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1595
+#: gfs2/fsck/initialize.c:1692
#, c-format
msgid "Device %s is busy.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1603
+#: gfs2/fsck/initialize.c:1700
msgid "Unable to unblock other mounters - manual intervention required\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1604
+#: gfs2/fsck/initialize.c:1701
msgid "Use 'gfs2_tool sb <device> proto' to fix\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1606
+#: gfs2/fsck/initialize.c:1703
msgid "Syncing the device.\n"
msgstr ""
-#: gfs2/fsck/initialize.c:1617
+#: gfs2/fsck/initialize.c:1714
msgid "fsck.gfs2: Non-fatal error dropping caches.\n"
msgstr ""
-#: gfs2/fsck/pass3.c:38 gfs2/fsck/pass2.c:1884
-msgid "Unable to allocate name\n"
-msgstr ""
-
-#: gfs2/fsck/pass3.c:45 gfs2/fsck/pass2.c:1890
-msgid "Unable to zero name\n"
-msgstr ""
-
-#: gfs2/fsck/pass3.c:53
+#: gfs2/fsck/pass3.c:39
msgid "Unable to remove \"..\" directory entry.\n"
msgstr ""
-#: gfs2/fsck/pass3.c:55
+#: gfs2/fsck/pass3.c:41
msgid "old \"..\""
msgstr ""
-#: gfs2/fsck/pass3.c:60 gfs2/fsck/pass2.c:1673 gfs2/fsck/pass2.c:1902
-#: gfs2/fsck/lost_n_found.c:240
+#: gfs2/fsck/pass3.c:46 gfs2/fsck/pass2.c:1765 gfs2/fsck/pass2.c:1989
+#: gfs2/fsck/lost_n_found.c:241
#, c-format
msgid "Error adding directory %s: %s\n"
msgstr ""
-#: gfs2/fsck/pass3.c:67 gfs2/fsck/pass2.c:1909
+#: gfs2/fsck/pass3.c:53 gfs2/fsck/pass2.c:1996
#, c-format
msgid "Directory at %lld (0x%llx)"
msgstr ""
-#: gfs2/fsck/pass3.c:72
+#: gfs2/fsck/pass3.c:58
msgid "new \"..\""
msgstr ""
-#: gfs2/fsck/pass3.c:94
+#: gfs2/fsck/pass3.c:79
#, c-format
msgid "Orphaned directory at block %llu (0x%llx) moved to lost+found\n"
msgstr ""
-#: gfs2/fsck/pass3.c:103
+#: gfs2/fsck/pass3.c:88
#, c-format
msgid ""
"Directory '..' and treewalk connections disagree for inode %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass3.c:107
+#: gfs2/fsck/pass3.c:92
#, c-format
msgid "'..' has %llu (0x%llx), treewalk has %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass3.c:123
+#: gfs2/fsck/pass3.c:108
msgid "Orphaned directory, move to lost+found\n"
msgstr ""
-#: gfs2/fsck/pass3.c:127
+#: gfs2/fsck/pass3.c:112
#, c-format
msgid "Treewalk parent is correct, fixing dotdot -> %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass3.c:139
+#: gfs2/fsck/pass3.c:124
msgid "Both .. and treewalk parents are directories, going with treewalk...\n"
msgstr ""
-#: gfs2/fsck/pass3.c:147
+#: gfs2/fsck/pass3.c:132
msgid ".. parent is valid, but treewalk is bad - reattaching to lost+found"
msgstr ""
-#: gfs2/fsck/pass3.c:152 gfs2/fsck/pass2.c:1837
+#: gfs2/fsck/pass3.c:137 gfs2/fsck/pass2.c:1943
#, c-format
msgid ""
"Remove directory entry for bad inode %llu (0x%llx) in %llu (0x%llx)? (y/n)"
msgstr ""
-#: gfs2/fsck/pass3.c:158
+#: gfs2/fsck/pass3.c:143
msgid "Directory entry to invalid inode remains\n"
msgstr ""
-#: gfs2/fsck/pass3.c:168
+#: gfs2/fsck/pass3.c:153
#, c-format
msgid "Unable to find dentry for block %llu (0x%llx) in %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass3.c:174 gfs2/fsck/pass2.c:1859
+#: gfs2/fsck/pass3.c:159 gfs2/fsck/pass2.c:1965
msgid "Directory entry removed\n"
msgstr ""
-#: gfs2/fsck/pass3.c:175
+#: gfs2/fsck/pass3.c:160
msgid "Marking directory unlinked\n"
msgstr ""
-#: gfs2/fsck/pass3.c:200
+#: gfs2/fsck/pass3.c:185
msgid "Marking root inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:206
+#: gfs2/fsck/pass3.c:191
msgid "Marking GFS1 statfs file inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:212
+#: gfs2/fsck/pass3.c:197
msgid "Marking GFS1 jindex file inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:218
+#: gfs2/fsck/pass3.c:203
msgid "Marking GFS1 rindex file inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:224
+#: gfs2/fsck/pass3.c:209
msgid "Marking GFS1 quota file inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:231
+#: gfs2/fsck/pass3.c:216
msgid "Marking master directory inode connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:241
+#: gfs2/fsck/pass3.c:226
msgid "Checking directory linkage.\n"
msgstr ""
-#: gfs2/fsck/pass3.c:254
+#: gfs2/fsck/pass3.c:239
#, c-format
msgid "Directory at block %llu (0x%llx) connected\n"
msgstr ""
-#: gfs2/fsck/pass3.c:263
+#: gfs2/fsck/pass3.c:248
msgid "Found unlinked directory containing bad block\n"
msgstr ""
-#: gfs2/fsck/pass3.c:265
+#: gfs2/fsck/pass3.c:250
msgid "Clear unlinked directory with bad blocks? (y/n) "
msgstr ""
-#: gfs2/fsck/pass3.c:267 gfs2/fsck/pass3.c:294
+#: gfs2/fsck/pass3.c:252 gfs2/fsck/pass3.c:279
#, c-format
msgid "inode %lld (0x%llx) is now marked as free\n"
msgstr ""
-#: gfs2/fsck/pass3.c:281
+#: gfs2/fsck/pass3.c:266
msgid "Unlinked directory with bad block remains\n"
msgstr ""
-#: gfs2/fsck/pass3.c:286
+#: gfs2/fsck/pass3.c:271
msgid "Unlinked block marked as an inode is not an inode\n"
msgstr ""
-#: gfs2/fsck/pass3.c:288
+#: gfs2/fsck/pass3.c:273
msgid "Clear the unlinked block? (y/n) "
msgstr ""
-#: gfs2/fsck/pass3.c:290
+#: gfs2/fsck/pass3.c:275
msgid "The block was not cleared\n"
msgstr ""
-#: gfs2/fsck/pass3.c:304
+#: gfs2/fsck/pass3.c:289
msgid "The block was cleared\n"
msgstr ""
-#: gfs2/fsck/pass3.c:308
+#: gfs2/fsck/pass3.c:293
#, c-format
msgid "Found unlinked directory at block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass3.c:315
+#: gfs2/fsck/pass3.c:300
msgid "Unlinked directory has zero size.\n"
msgstr ""
-#: gfs2/fsck/pass3.c:317
+#: gfs2/fsck/pass3.c:302
msgid "Remove zero-size unlinked directory? (y/n) "
msgstr ""
-#: gfs2/fsck/pass3.c:321
+#: gfs2/fsck/pass3.c:306
msgid "zero-sized unlinked inode"
msgstr ""
-#: gfs2/fsck/pass3.c:326
+#: gfs2/fsck/pass3.c:311
msgid "Zero-size unlinked directory remains\n"
msgstr ""
-#: gfs2/fsck/pass3.c:330
+#: gfs2/fsck/pass3.c:315
msgid "Add unlinked directory to lost+found? (y/n) "
msgstr ""
-#: gfs2/fsck/pass3.c:337
+#: gfs2/fsck/pass3.c:322
msgid "Directory relinked to lost+found\n"
msgstr ""
-#: gfs2/fsck/pass3.c:339
+#: gfs2/fsck/pass3.c:324
msgid "Unlinked directory remains unlinked\n"
msgstr ""
-#: gfs2/fsck/pass3.c:346
+#: gfs2/fsck/pass3.c:331
#, c-format
msgid "At end of pass3, lost+found entries is %u\n"
msgstr ""
@@ -1968,14 +2079,14 @@ msgstr ""
msgid "Invalid block type\n"
msgstr ""
-#: gfs2/fsck/pass2.c:201 gfs2/fsck/pass2.c:628
+#: gfs2/fsck/pass2.c:201 gfs2/fsck/pass2.c:631
#, c-format
msgid ""
"Directory entry '%s' pointing to block %llu (0x%llx) in directory %llu (0x"
"%llx) has the wrong 'formal' inode number.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:207 gfs2/fsck/pass2.c:635
+#: gfs2/fsck/pass2.c:207 gfs2/fsck/pass2.c:638
#, c-format
msgid "The directory entry has %llu (0x%llx) but the inode has %llu (0x%llx)\n"
msgstr ""
@@ -2004,7 +2115,7 @@ msgstr ""
msgid "fixed reference"
msgstr ""
-#: gfs2/fsck/pass2.c:235 gfs2/fsck/pass2.c:473
+#: gfs2/fsck/pass2.c:235 gfs2/fsck/pass2.c:476
msgid "Directory entry not fixed.\n"
msgstr ""
@@ -2065,43 +2176,48 @@ msgstr ""
msgid "The misplaced directory entry was moved to a valid leaf block.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:375
+#: gfs2/fsck/pass2.c:374
+#, c-format
+msgid "Could not read leaf %d in dinode %<PRIu64>: %s\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:378
#, c-format
msgid ""
"The planned leaf was split. The new leaf is: %llu (0x%llx). di_blocks=%llu\n"
msgstr ""
-#: gfs2/fsck/pass2.c:380 gfs2/fsck/pass2.c:1236
+#: gfs2/fsck/pass2.c:383 gfs2/fsck/pass2.c:1239
msgid "split leaf"
msgstr ""
-#: gfs2/fsck/pass2.c:390
+#: gfs2/fsck/pass2.c:393
msgid "Accounting deferred.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:408
+#: gfs2/fsck/pass2.c:411
msgid "moved valid reference"
msgstr ""
-#: gfs2/fsck/pass2.c:423
+#: gfs2/fsck/pass2.c:426
msgid "Error moving directory entry.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:451
+#: gfs2/fsck/pass2.c:454
#, c-format
msgid ""
"Block # referenced by directory entry %s in inode %lld (0x%llx) is invalid\n"
msgstr ""
-#: gfs2/fsck/pass2.c:455
+#: gfs2/fsck/pass2.c:458
msgid "Clear directory entry to out of range block? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:459
+#: gfs2/fsck/pass2.c:462
msgid "Directory entry to out of range block remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:469
+#: gfs2/fsck/pass2.c:472
#, c-format
msgid ""
"Dir entry with bad record or name length\n"
@@ -2109,19 +2225,19 @@ msgid ""
"\tName length = %u\n"
msgstr ""
-#: gfs2/fsck/pass2.c:472
+#: gfs2/fsck/pass2.c:475
msgid "Clear the directory entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:477
+#: gfs2/fsck/pass2.c:480
msgid "corrupt directory entry"
msgstr ""
-#: gfs2/fsck/pass2.c:479
+#: gfs2/fsck/pass2.c:482
msgid "Bad directory entry deleted.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:485
+#: gfs2/fsck/pass2.c:488
#, c-format
msgid ""
"Dir entry with bad hash or name length\n"
@@ -2129,829 +2245,863 @@ msgid ""
"\tFilename = %s\n"
msgstr ""
-#: gfs2/fsck/pass2.c:489
+#: gfs2/fsck/pass2.c:492
#, c-format
msgid ""
"\tName length found = %u\n"
"\tHash expected = %u (0x%x)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:492
+#: gfs2/fsck/pass2.c:495
#, c-format
msgid "Fix directory hash for %s? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:494
+#: gfs2/fsck/pass2.c:497
#, c-format
msgid "Directory entry hash for %s not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:501
+#: gfs2/fsck/pass2.c:504
#, c-format
msgid "Directory entry hash for %s fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:523
+#: gfs2/fsck/pass2.c:526
#, c-format
msgid "Found directory entry '%s' pointing to invalid block %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:528
+#: gfs2/fsck/pass2.c:531
msgid "Delete inode containing bad blocks? (y/n)"
msgstr ""
-#: gfs2/fsck/pass2.c:529
+#: gfs2/fsck/pass2.c:532
msgid "Entry to inode containing bad blocks remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:547
+#: gfs2/fsck/pass2.c:550
msgid "bad directory entry"
msgstr ""
-#: gfs2/fsck/pass2.c:548
+#: gfs2/fsck/pass2.c:551
#, c-format
msgid "Inode %lld (0x%llx) was deleted.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:554
+#: gfs2/fsck/pass2.c:557
#, c-format
msgid ""
"Directory entry '%s' referencing inode %llu (0x%llx) in dir inode %llu (0x"
"%llx) block type %d: %s.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:562
+#: gfs2/fsck/pass2.c:565
msgid "was previously marked invalid"
msgstr ""
-#: gfs2/fsck/pass2.c:563
+#: gfs2/fsck/pass2.c:566
msgid "was deleted or is not an inode"
msgstr ""
-#: gfs2/fsck/pass2.c:565
+#: gfs2/fsck/pass2.c:568
msgid "Clear directory entry to non-inode block? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:567
+#: gfs2/fsck/pass2.c:570
msgid "Directory entry to non-inode block remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:592
+#: gfs2/fsck/pass2.c:595
#, c-format
msgid ""
"Error: directory entry type is incompatible with block type at block %lld (0x"
"%llx) in directory inode %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:599
+#: gfs2/fsck/pass2.c:602
#, c-format
msgid "Directory entry type is %d, block type is %d.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:605
+#: gfs2/fsck/pass2.c:608
#, c-format
msgid ""
"Type '%s' in dir entry (%s, %llu/0x%llx) conflicts with type '%s' in dinode. "
"(Dir entry is stale.)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:611
+#: gfs2/fsck/pass2.c:614
msgid "Clear stale directory entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:612
+#: gfs2/fsck/pass2.c:615
msgid "Stale directory entry remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:684
+#: gfs2/fsck/pass2.c:687
#, c-format
msgid "Found . dentry in directory %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:689
+#: gfs2/fsck/pass2.c:692
#, c-format
msgid "Already found '.' entry in directory %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:693
+#: gfs2/fsck/pass2.c:696
msgid "Clear duplicate '.' entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:694
+#: gfs2/fsck/pass2.c:697
msgid "Duplicate '.' entry remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:714
+#: gfs2/fsck/pass2.c:717
#, c-format
msgid ""
"'.' entry's value incorrect in directory %llu (0x%llx). Points to %llu (0x"
"%llx) when it should point to %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:724
+#: gfs2/fsck/pass2.c:727
msgid "Remove '.' reference? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:725
+#: gfs2/fsck/pass2.c:728
msgid "Invalid '.' reference remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:744
+#: gfs2/fsck/pass2.c:747
#, c-format
msgid "Found '..' dentry in directory %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:748
+#: gfs2/fsck/pass2.c:751
#, c-format
msgid "Already had a '..' entry in directory %llu(0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:752
+#: gfs2/fsck/pass2.c:755
msgid "Clear duplicate '..' entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:753
+#: gfs2/fsck/pass2.c:756
msgid "Duplicate '..' entry remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:772
+#: gfs2/fsck/pass2.c:775
#, c-format
msgid ""
"Found '..' entry in directory %llu (0x%llx) pointing to something that's not "
"a directory"
msgstr ""
-#: gfs2/fsck/pass2.c:776
+#: gfs2/fsck/pass2.c:779
msgid "Clear bad '..' directory entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:777
+#: gfs2/fsck/pass2.c:780
msgid "Bad '..' directory entry remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:821
+#: gfs2/fsck/pass2.c:824
#, c-format
msgid "Found non-dir inode dentry pointing to %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:831
+#: gfs2/fsck/pass2.c:834
#, c-format
msgid "%s: Hard link to block %llu (0x%llx) detected.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:836
+#: gfs2/fsck/pass2.c:839
msgid "Clear hard link to directory? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:839
+#: gfs2/fsck/pass2.c:842
msgid "Hard link to directory remains\n"
msgstr ""
-#: gfs2/fsck/pass2.c:848
+#: gfs2/fsck/pass2.c:851
msgid "valid reference"
msgstr ""
-#: gfs2/fsck/pass2.c:860 gfs2/fsck/pass2.c:1047
+#: gfs2/fsck/pass2.c:863 gfs2/fsck/pass2.c:1050
#, c-format
msgid "Bad directory entry '%s' cleared.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:878
+#: gfs2/fsck/pass2.c:881
#, c-format
msgid ""
"Padding inode %llu (0x%llx) hash table at offset %d (0x%x) for %d pointers.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:899
+#: gfs2/fsck/pass2.c:902
#, c-format
msgid ""
"New leaf block was allocated at %llu (0x%llx) for index %d (0x%x), length "
"%d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:904
+#: gfs2/fsck/pass2.c:907
msgid "pad leaf"
msgstr ""
-#: gfs2/fsck/pass2.c:931
+#: gfs2/fsck/pass2.c:934
#, c-format
msgid ""
"Leaf block %llu (0x%llx) seems to be out of place and its contents need to "
"be moved to lost+found.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:934
+#: gfs2/fsck/pass2.c:937
msgid "Attempt to fix it? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:935
+#: gfs2/fsck/pass2.c:938
msgid "Directory leaf was not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:949
+#: gfs2/fsck/pass2.c:952
msgid "Encountered bad filename length; stopped processing.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:955
+#: gfs2/fsck/pass2.c:958
msgid "Skipping entry '.'\n"
msgstr ""
-#: gfs2/fsck/pass2.c:958
+#: gfs2/fsck/pass2.c:961
msgid "Skipping entry '..'\n"
msgstr ""
-#: gfs2/fsck/pass2.c:960
+#: gfs2/fsck/pass2.c:963
#, c-format
msgid "Skipping sentinel '%s'\n"
msgstr ""
-#: gfs2/fsck/pass2.c:970
+#: gfs2/fsck/pass2.c:973
#, c-format
msgid "Not relocating corrupt entry \"%s\".\n"
msgstr ""
-#: gfs2/fsck/pass2.c:977
+#: gfs2/fsck/pass2.c:980
#, c-format
msgid "Error %d encountered while trying to relocate \"%s\" to lost+found.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:985 gfs2/fsck/lost_n_found.c:250
+#: gfs2/fsck/pass2.c:988 gfs2/fsck/lost_n_found.c:251
msgid "from lost+found"
msgstr ""
-#: gfs2/fsck/pass2.c:991 gfs2/fsck/lost_n_found.c:253
+#: gfs2/fsck/pass2.c:994 gfs2/fsck/lost_n_found.c:254
msgid "to lost+found"
msgstr ""
-#: gfs2/fsck/pass2.c:992
+#: gfs2/fsck/pass2.c:995
#, c-format
msgid "Relocated \"%s\", block %llu (0x%llx) to lost+found.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1003
+#: gfs2/fsck/pass2.c:1006
msgid ""
"Directory entries from misplaced leaf block were relocated to lost+found.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1006
+#: gfs2/fsck/pass2.c:1009
msgid "lost leaf"
msgstr ""
-#: gfs2/fsck/pass2.c:1115
+#: gfs2/fsck/pass2.c:1118
#, c-format
msgid ""
"Dinode %llu (0x%llx) has a hash table error at index 0x%x, length 0x%x: leaf "
"block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1120 gfs2/fsck/pass2.c:1340 gfs2/fsck/pass2.c:1364
-#: gfs2/fsck/pass2.c:1462 gfs2/fsck/pass2.c:1550
+#: gfs2/fsck/pass2.c:1123 gfs2/fsck/pass2.c:1343 gfs2/fsck/pass2.c:1367
+#: gfs2/fsck/pass2.c:1464 gfs2/fsck/pass2.c:1552
msgid "Fix the hash table? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:1121 gfs2/fsck/pass2.c:1341 gfs2/fsck/pass2.c:1365
-#: gfs2/fsck/pass2.c:1463 gfs2/fsck/pass2.c:1551
+#: gfs2/fsck/pass2.c:1124 gfs2/fsck/pass2.c:1344 gfs2/fsck/pass2.c:1368
+#: gfs2/fsck/pass2.c:1465 gfs2/fsck/pass2.c:1553
msgid "Hash table not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1136
+#: gfs2/fsck/pass2.c:1139
#, c-format
msgid "This leaf block's depth (%d) is too big for this dinode's depth (%d)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1154
+#: gfs2/fsck/pass2.c:1157
#, c-format
msgid ""
"Out of place leaf block %llu (0x%llx) had no entries, so it was deleted.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1159
+#: gfs2/fsck/pass2.c:1162
#, c-format
msgid "Reprocessing index 0x%x (case 1).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1172
+#: gfs2/fsck/pass2.c:1175
#, c-format
msgid ""
"This leaf block has hash index %d, which is out of bounds for where it "
"appears in the hash table (%d - %d)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1185
+#: gfs2/fsck/pass2.c:1188
#, c-format
msgid "Leaf pointers start at %d (0x%x), should be %d (%x).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1200
+#: gfs2/fsck/pass2.c:1203
#, c-format
msgid ""
"Leaf block should start at 0x%x, but it appears at 0x%x in the hash table.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1215
+#: gfs2/fsck/pass2.c:1218
#, c-format
msgid "For depth %d, length %d, the proper start is: 0x%x.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1223
+#: gfs2/fsck/pass2.c:1226
#, c-format
msgid "Leaf block %llu (0x%llx) was split from length %d to %d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1227
+#: gfs2/fsck/pass2.c:1230
#, c-format
msgid "Programming error: proper_len=%d, di_depth = %d, lf_depth = %d.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1232
+#: gfs2/fsck/pass2.c:1235
#, c-format
msgid ""
"New split-off leaf block was allocated at %lld (0x%llx) for index %d (0x%x)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1238
+#: gfs2/fsck/pass2.c:1241
msgid "Hash table repaired.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1243
+#: gfs2/fsck/pass2.c:1246
msgid ""
"One leaf split is not enough. The hash table will need to be reprocessed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1252
+#: gfs2/fsck/pass2.c:1255
#, c-format
msgid "There are %d pointers, but leaf 0x%llx's depth, %d, only allows %d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1271
+#: gfs2/fsck/pass2.c:1274
#, c-format
msgid "Found %d extra pointers to leaf %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1275
+#: gfs2/fsck/pass2.c:1278
#, c-format
msgid "Reprocessing index 0x%x (case 2).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1307
+#: gfs2/fsck/pass2.c:1310
#, c-format
msgid ""
"Dinode %llu (0x%llx) has duplicate leaf pointers to block %llu (0x%llx) at "
"offsets %u (0x%x) (for 0x%x) and %u (0x%x) (for 0x%x)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1337
+#: gfs2/fsck/pass2.c:1340
#, c-format
msgid ""
"This leaf block has hash index %d, which is out of bounds for lindex (%d - "
"%d)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1352 gfs2/fsck/pass2.c:1375
+#: gfs2/fsck/pass2.c:1355 gfs2/fsck/pass2.c:1378
#, c-format
msgid "Hash index 0x%x is the proper reference to leaf 0x%llx.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1361
+#: gfs2/fsck/pass2.c:1364
#, c-format
msgid ""
"This leaf block has hash index %d, which is out of bounds for lindex (%d - "
"%d).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1457
+#: gfs2/fsck/pass2.c:1459
#, c-format
msgid "Dinode %llu (0x%llx) has bad leaf pointers at offset %d for %d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1468 gfs2/fsck/metawalk.c:2019
+#: gfs2/fsck/pass2.c:1470 gfs2/fsck/metawalk.c:2093
msgid "replacing"
msgstr ""
-#: gfs2/fsck/pass2.c:1485
+#: gfs2/fsck/pass2.c:1487
#, c-format
msgid ""
"lindex 0x%llx is not a proper starting point for leaf %llu (0x%llx): 0x%llx\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1497
+#: gfs2/fsck/pass2.c:1499
msgid "More leaf splits are needed; "
msgstr ""
-#: gfs2/fsck/pass2.c:1499
+#: gfs2/fsck/pass2.c:1501
#, c-format
msgid "Reprocessing index 0x%x (case 3).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1511
+#: gfs2/fsck/pass2.c:1513
#, c-format
msgid ""
"Length %d (0x%x) is not a proper length for leaf %llu (0x%llx). Valid "
"boundary assumed to be %d (0x%x).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1531
+#: gfs2/fsck/pass2.c:1533
#, c-format
msgid "Reprocessing index 0x%x (case 4).\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1545
+#: gfs2/fsck/pass2.c:1547
#, c-format
msgid ""
"Dinode %llu (0x%llx) has a hash table inconsistency at index %d (0x%x) for "
"%d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1564
+#: gfs2/fsck/pass2.c:1566
#, c-format
msgid "Length 0x%x is not proper for leaf %llu (0x%llx): 0x%x\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1610
+#: gfs2/fsck/pass2.c:1622
+#, c-format
+msgid ""
+"Error: quota_change block at %lld (0x%llx) is the wrong metadata type.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1656
+#, c-format
+msgid "Checking system file %s\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1659
+#, c-format
+msgid "System file %s is missing.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1660 gfs2/fsck/pass2.c:1673
+msgid "Rebuild the system file? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1671
+#, c-format
+msgid "System file %s has an invalid size. Is %llu, should be %llu.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1682
+#, c-format
+msgid "System file %s has bad contents.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1683
+msgid "Delete and rebuild the system file? (y/n) "
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1696
+#, c-format
+msgid "Error building %s\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1701
+#, c-format
+msgid "Error rebuilding %s.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1706
+#, c-format
+msgid "System file %s rebuilt.\n"
+msgstr ""
+
+#: gfs2/fsck/pass2.c:1719
#, c-format
msgid "Checking system directory inode '%s'\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1613
+#: gfs2/fsck/pass2.c:1722
#, c-format
msgid "Failed to check '%s': sysinode is null\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1631
+#: gfs2/fsck/pass2.c:1740
msgid "System inode"
msgstr ""
-#: gfs2/fsck/pass2.c:1649
+#: gfs2/fsck/pass2.c:1758
#, c-format
msgid "No '.' entry found for %s directory.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1650 gfs2/fsck/pass2.c:1878
+#: gfs2/fsck/pass2.c:1759 gfs2/fsck/pass2.c:1984
msgid "Is it okay to add '.' entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:1655
-msgid "Unable to allocate name string\n"
-msgstr ""
-
-#: gfs2/fsck/pass2.c:1661
-msgid "Unable to zero name string\n"
-msgstr ""
-
-#: gfs2/fsck/pass2.c:1667
+#: gfs2/fsck/pass2.c:1761
msgid "Adding '.' entry\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1686 gfs2/fsck/pass2.c:1922
+#: gfs2/fsck/pass2.c:1776 gfs2/fsck/pass2.c:2008
msgid "The directory was not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1689
+#: gfs2/fsck/pass2.c:1779
#, c-format
msgid "%s inode %llu (0x%llx): Entries is %d - should be %d\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1694
+#: gfs2/fsck/pass2.c:1784
#, c-format
msgid "Fix entries for %s inode %llu (0x%llx)? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:1700
+#: gfs2/fsck/pass2.c:1790
msgid "Entries updated\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1702
+#: gfs2/fsck/pass2.c:1792
#, c-format
msgid "Entries for inode %llu (0x%llx) left out of sync\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1779
+#: gfs2/fsck/pass2.c:1885
msgid "Checking directory inodes.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1799
+#: gfs2/fsck/pass2.c:1905
msgid "Pass2 skipping the new lost+found.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1803
+#: gfs2/fsck/pass2.c:1909
#, c-format
msgid "Checking directory inode at block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1851
+#: gfs2/fsck/pass2.c:1957
#, c-format
msgid "Unable to find dentry for %llu (0x%llx) in %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1861
+#: gfs2/fsck/pass2.c:1967
msgid "Directory entry to invalid inode remains.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1862
+#: gfs2/fsck/pass2.c:1968
#, c-format
msgid "Directory block %lld (0x%llx) is now marked as 'invalid'\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1873
+#: gfs2/fsck/pass2.c:1979
#, c-format
msgid "No '.' entry found for directory inode at block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1917
+#: gfs2/fsck/pass2.c:2004
msgid "\". (itself)\""
msgstr ""
-#: gfs2/fsck/pass2.c:1920
+#: gfs2/fsck/pass2.c:2006
msgid "The directory was fixed.\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1927
+#: gfs2/fsck/pass2.c:2013
#, c-format
msgid "Entries is %d - should be %d for inode block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass2.c:1932
+#: gfs2/fsck/pass2.c:2018
msgid "Fix the entry count? (y/n) "
msgstr ""
-#: gfs2/fsck/pass2.c:1936
+#: gfs2/fsck/pass2.c:2022
msgid "The entry count was not fixed.\n"
msgstr ""
-#: gfs2/fsck/eattr.c:42 gfs2/fsck/metawalk.c:1744 gfs2/fsck/pass1.c:866
-#, c-format
-msgid ""
-" Pointers Required: %d\n"
-" Pointers Reported: %d\n"
-msgstr ""
-
-#: gfs2/fsck/metawalk.c:40
+#: gfs2/fsck/metawalk.c:41
#, c-format
msgid ""
"Block %llu (0x%llx) is not represented in the system bitmap; part of an rgrp "
"or superblock.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:54
+#: gfs2/fsck/metawalk.c:55
#, c-format
msgid ""
"Reference as '%s' to block %llu (0x%llx) which was marked as dinode. Needs "
"further investigation.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:64
+#: gfs2/fsck/metawalk.c:65
#, c-format
msgid "Block %llu (0x%llx) was '%s', should be %s.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:68
+#: gfs2/fsck/metawalk.c:69
msgid "Fix the bitmap? (y/n)"
msgstr ""
-#: gfs2/fsck/metawalk.c:105
+#: gfs2/fsck/metawalk.c:104
msgid "The bitmap was fixed.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:107
+#: gfs2/fsck/metawalk.c:106
msgid "The bitmap inconsistency was ignored.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:143
+#: gfs2/fsck/metawalk.c:142
#, c-format
msgid "(%s:%d) %s inode found at block (0x%llx): marking as '%s'\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:154 gfs2/fsck/metawalk.c:165
+#: gfs2/fsck/metawalk.c:153 gfs2/fsck/metawalk.c:164
#, c-format
msgid "(%s:%d) inode (0x%llx) references %s block (0x%llx): marking as '%s'\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:181
+#: gfs2/fsck/metawalk.c:180
msgid "This block is not represented in the bitmap.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:374
+#: gfs2/fsck/metawalk.c:373
#, c-format
msgid "Checking leaf %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:378
+#: gfs2/fsck/metawalk.c:377
#, c-format
msgid "Invalid directory type %d specified\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:396
+#: gfs2/fsck/metawalk.c:395
#, c-format
msgid ""
"Directory block %llu (0x%llx), entry %d of directory %llu (0x%llx) is "
"corrupt.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:404
+#: gfs2/fsck/metawalk.c:403
msgid "Attempt to repair it? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:411
+#: gfs2/fsck/metawalk.c:410
msgid ""
"Unable to repair corrupt directory entry; the entry was removed instead.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:417
+#: gfs2/fsck/metawalk.c:416
msgid "Corrupt directory entry repaired.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:422 gfs2/fsck/metawalk.c:445
+#: gfs2/fsck/metawalk.c:421 gfs2/fsck/metawalk.c:444
#, c-format
msgid "Corrupt directory entry ignored, stopped after checking %d entries.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:430
+#: gfs2/fsck/metawalk.c:429
msgid "First dirent is a sentinel (place holder).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:433
+#: gfs2/fsck/metawalk.c:432
#, c-format
msgid ""
"Directory entry with inode number of zero in leaf %llu (0x%llx) of directory "
"%llu (0x%llx)!\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:440
+#: gfs2/fsck/metawalk.c:439
msgid "Attempt to remove it? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:442
+#: gfs2/fsck/metawalk.c:441
msgid "The corrupt directory entry was removed.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:454
+#: gfs2/fsck/metawalk.c:453
msgid "First dirent is a Sentinel (place holder).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:475
+#: gfs2/fsck/metawalk.c:474
#, c-format
msgid "Last entry processed for %lld->%lld (0x%llx->0x%llx), di_blocks=%llu.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:511
+#: gfs2/fsck/metawalk.c:510
#, c-format
msgid ""
"Leaf block #%llu (0x%llx) is out of range for directory #%llu (0x%llx) at "
"index %d (0x%x).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:518
+#: gfs2/fsck/metawalk.c:517
msgid "that is out of range"
msgstr ""
-#: gfs2/fsck/metawalk.c:526
+#: gfs2/fsck/metawalk.c:525
msgid "that is not really a leaf"
msgstr ""
-#: gfs2/fsck/metawalk.c:535
+#: gfs2/fsck/metawalk.c:534
#, c-format
msgid ""
"Previous reference to leaf %lld (0x%llx) has already checked it; skipping.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:550
+#: gfs2/fsck/metawalk.c:549
#, c-format
msgid "incorrect lf_dirent_format at leaf #%<PRIu64>\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:554
+#: gfs2/fsck/metawalk.c:553
msgid "Fixing lf_dirent_format.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:559
+#: gfs2/fsck/metawalk.c:558
#, c-format
msgid "Inode %llu (0x%llx) points to bad leaf %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:565
+#: gfs2/fsck/metawalk.c:564
msgid "that is not a leaf"
msgstr ""
-#: gfs2/fsck/metawalk.c:590
+#: gfs2/fsck/metawalk.c:589
#, c-format
msgid ""
"Leaf %llu (0x%llx) entry count in directory %llu (0x%llx) does not match "
"number of entries found - is %u, found %u\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:598
+#: gfs2/fsck/metawalk.c:597
msgid "Update leaf entry count? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:601
+#: gfs2/fsck/metawalk.c:600
msgid "Leaf entry count updated\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:603
+#: gfs2/fsck/metawalk.c:602
msgid "Leaf entry count left in inconsistant state\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:723
+#: gfs2/fsck/metawalk.c:721
#, c-format
msgid "Directory #%llu (0x%llx) has no valid leaf blocks\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:741
+#: gfs2/fsck/metawalk.c:739
#, c-format
msgid "Re-reading 0x%llx hash table.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:783
+#: gfs2/fsck/metawalk.c:782
#, c-format
msgid "Leaf chain #%d (0x%llx) detected.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:787
+#: gfs2/fsck/metawalk.c:786
#, c-format
msgid "Depth of 0x%llx changed from %d to %d\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:793
+#: gfs2/fsck/metawalk.c:792
#, c-format
msgid "Height of 0x%llx changed from %d to %d\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:800
+#: gfs2/fsck/metawalk.c:799
#, c-format
msgid "Block count of 0x%llx changed from %llu to %llu\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:863
+#: gfs2/fsck/metawalk.c:862
#, c-format
msgid "Bad extended attribute found at block %lld (0x%llx)"
msgstr ""
-#: gfs2/fsck/metawalk.c:870
+#: gfs2/fsck/metawalk.c:869
msgid "Repair the bad Extended Attribute? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:882 gfs2/fsck/metawalk.c:1700
-#: gfs2/fsck/metawalk.c:1757 gfs2/fsck/pass1.c:961
+#: gfs2/fsck/metawalk.c:881 gfs2/fsck/metawalk.c:1769
+#: gfs2/fsck/metawalk.c:1826 gfs2/fsck/pass1.c:962
msgid "extended attribute"
msgstr ""
-#: gfs2/fsck/metawalk.c:884
+#: gfs2/fsck/metawalk.c:883
msgid "The EA was fixed.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:888
+#: gfs2/fsck/metawalk.c:887
msgid "The bad EA was not fixed.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:926
+#: gfs2/fsck/metawalk.c:925
#, c-format
msgid "Checking EA leaf block #%llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:986
+#: gfs2/fsck/metawalk.c:985
msgid "This was the last reference: it's no longer a duplicate.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:992
+#: gfs2/fsck/metawalk.c:991
#, c-format
msgid "%d block reference(s) remain.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1015
+#: gfs2/fsck/metawalk.c:1014
#, c-format
msgid ""
"%s block %lld (0x%llx), part of inode %lld (0x%llx), was already free.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1026
+#: gfs2/fsck/metawalk.c:1025
#, c-format
msgid ""
"Not clearing duplicate reference in inode at block #%llu (0x%llx) to block #"
"%llu (0x%llx) because it's referenced by another inode.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1057
+#: gfs2/fsck/metawalk.c:1056
#, c-format
msgid "Checking EA indirect block #%llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1077
+#: gfs2/fsck/metawalk.c:1076
msgid "Fix the indirect block too? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:1146
+#: gfs2/fsck/metawalk.c:1145
#, c-format
msgid "Extended attributes exist for inode #%llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1268
+#: gfs2/fsck/metawalk.c:1331
#, c-format
msgid ""
"\n"
"Serious metadata error on block %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1276
+#: gfs2/fsck/metawalk.c:1339
#, c-format
msgid ""
"\n"
@@ -2959,447 +3109,450 @@ msgid ""
"be skipped.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1285
+#: gfs2/fsck/metawalk.c:1348
#, c-format
msgid "Skipping rejected block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1292
+#: gfs2/fsck/metawalk.c:1358
#, c-format
msgid "Skipping duplicate %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1299
+#: gfs2/fsck/metawalk.c:1365
#, c-format
msgid "Skipping invalid block %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1356
+#: gfs2/fsck/metawalk.c:1425
msgid "Unrecoverable "
msgstr ""
-#: gfs2/fsck/metawalk.c:1358
+#: gfs2/fsck/metawalk.c:1427
#, c-format
msgid "data block error %d on block %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1479
+#: gfs2/fsck/metawalk.c:1548
#, c-format
msgid ""
"\rLarge file at %lld (0x%llx) - 100 percent "
"complete. \n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1489
+#: gfs2/fsck/metawalk.c:1558
#, c-format
msgid "Error: inode %llu (0x%llx) had unrecoverable errors.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1492
+#: gfs2/fsck/metawalk.c:1561
msgid "Remove the invalid inode? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:1494
+#: gfs2/fsck/metawalk.c:1563
msgid "Invalid inode not deleted.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1503
+#: gfs2/fsck/metawalk.c:1572
#, c-format
msgid "Undoing metadata work for block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1540
+#: gfs2/fsck/metawalk.c:1609
msgid "corrupt"
msgstr ""
-#: gfs2/fsck/metawalk.c:1541
+#: gfs2/fsck/metawalk.c:1610
msgid "The corrupt inode was invalidated.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1582
+#: gfs2/fsck/metawalk.c:1651
msgid "Current"
msgstr ""
-#: gfs2/fsck/metawalk.c:1619
+#: gfs2/fsck/metawalk.c:1688
#, c-format
msgid "Removing dentry %llu (0x%llx) from directory %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1624
+#: gfs2/fsck/metawalk.c:1693
msgid "Parent directory is invalid\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1632
+#: gfs2/fsck/metawalk.c:1701
msgid "Parent block is not a directory...ignoring\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1648 gfs2/fsck/pass1.c:929
+#: gfs2/fsck/metawalk.c:1717 gfs2/fsck/pass1.c:930
msgid "metadata"
msgstr ""
-#: gfs2/fsck/metawalk.c:1654 gfs2/fsck/pass1.c:936
+#: gfs2/fsck/metawalk.c:1723 gfs2/fsck/pass1.c:937
msgid "leaf"
msgstr ""
-#: gfs2/fsck/metawalk.c:1661 gfs2/fsck/pass1.c:405 gfs2/fsck/pass1.c:431
-#: gfs2/fsck/pass1.c:943
+#: gfs2/fsck/metawalk.c:1730 gfs2/fsck/pass1.c:406 gfs2/fsck/pass1.c:432
+#: gfs2/fsck/pass1.c:944
msgid "data"
msgstr ""
-#: gfs2/fsck/metawalk.c:1707 gfs2/fsck/pass1.c:952
+#: gfs2/fsck/metawalk.c:1776 gfs2/fsck/pass1.c:953
msgid "indirect extended attribute"
msgstr ""
-#: gfs2/fsck/metawalk.c:1776
+#: gfs2/fsck/metawalk.c:1813 gfs2/fsck/pass1.c:867
+#, c-format
+msgid ""
+" Pointers Required: %d\n"
+" Pointers Reported: %d\n"
+msgstr ""
+
+#: gfs2/fsck/metawalk.c:1845
#, c-format
msgid ""
"%s reference to new metadata block %lld (0x%llx) is now marked as indirect.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1796
+#: gfs2/fsck/metawalk.c:1865
#, c-format
msgid "%s reference to new data block %lld (0x%llx) is now marked as data.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1814
+#: gfs2/fsck/metawalk.c:1883
msgid "newly allocated leaf"
msgstr ""
-#: gfs2/fsck/metawalk.c:1854
+#: gfs2/fsck/metawalk.c:1923
#, c-format
msgid ""
"%s inode %llu (0x%llx) had blocks added; reprocessing its metadata tree at "
"height=%d.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1861
+#: gfs2/fsck/metawalk.c:1930
#, c-format
msgid "Error %d reprocessing the %s metadata tree.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1894
+#: gfs2/fsck/metawalk.c:1963
msgid "Program error: num_copies not a factor of 2.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1895
+#: gfs2/fsck/metawalk.c:1964
#, c-format
msgid "num_copies=%d, dinode = %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1899
+#: gfs2/fsck/metawalk.c:1968
#, c-format
msgid "lindex = %d (0x%x)\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1907 gfs2/fsck/pass1.c:240
+#: gfs2/fsck/metawalk.c:1976
+msgid "Error: allocation failed while fixing directory leaf pointers.\n"
+msgstr ""
+
+#: gfs2/fsck/metawalk.c:1981 gfs2/fsck/pass1.c:241
msgid "directory leaf"
msgstr ""
-#: gfs2/fsck/metawalk.c:1908
+#: gfs2/fsck/metawalk.c:1982
#, c-format
msgid ""
"A new directory leaf was allocated at block %lld (0x%llx) to fill the %d (0x"
"%x) pointer gap %s the existing pointer at index %d (0x%x).\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1937
+#: gfs2/fsck/metawalk.c:2011
#, c-format
msgid ""
"Writing to the hash table of directory %lld (0x%llx) at index: 0x%x for 0x"
"%lx pointers.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1950
+#: gfs2/fsck/metawalk.c:2024
msgid "Error: bad write while fixing directory leaf pointers.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1969
+#: gfs2/fsck/metawalk.c:2043
#, c-format
msgid "Directory Inode %llu (0x%llx) points to leaf %llu (0x%llx) %s.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1975
+#: gfs2/fsck/metawalk.c:2049
msgid "Attempt to patch around it? (y/n) "
msgstr ""
-#: gfs2/fsck/metawalk.c:1976
+#: gfs2/fsck/metawalk.c:2050
msgid "Bad leaf left in place.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:1991
+#: gfs2/fsck/metawalk.c:2065
#, c-format
msgid ""
"Writing zeros to the hash table of directory %lld (0x%llx) at index: 0x%x "
"for 0x%x pointers.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:2003
+#: gfs2/fsck/metawalk.c:2077
#, c-format
msgid "Directory Inode %llu (0x%llx) patched.\n"
msgstr ""
-#: gfs2/fsck/metawalk.c:2027
+#: gfs2/fsck/metawalk.c:2101
#, c-format
msgid "Directory Inode %llu (0x%llx) repaired.\n"
msgstr ""
-#: gfs2/fsck/util.c:51
+#: gfs2/fsck/util.c:52
#, c-format
msgid ""
"\rChecking %lld%c of %lld%c of file at %lld (0x%llx)- %llu percent "
"complete. \r"
msgstr ""
-#: gfs2/fsck/util.c:83
+#: gfs2/fsck/util.c:84
#, c-format
msgid "\r%llu percent complete.\r"
msgstr ""
-#: gfs2/fsck/util.c:254
+#: gfs2/fsck/util.c:255
msgid "Unable to allocate duptree structure\n"
msgstr ""
-#: gfs2/fsck/util.c:341
+#: gfs2/fsck/util.c:342
#, c-format
msgid ""
"Original reference to block %llu (0x%llx) was previously found to be bad and "
"deleted.\n"
msgstr ""
-#: gfs2/fsck/util.c:345
+#: gfs2/fsck/util.c:346
#, c-format
msgid ""
"I'll consider the reference from inode %llu (0x%llx) the first reference.\n"
msgstr ""
-#: gfs2/fsck/util.c:369
+#: gfs2/fsck/util.c:371
msgid "Unable to allocate inode_with_dups structure\n"
msgstr ""
-#: gfs2/fsck/util.c:374
-msgid "Unable to zero inode_with_dups structure\n"
-msgstr ""
-
-#: gfs2/fsck/util.c:399
+#: gfs2/fsck/util.c:395
#, c-format
msgid ""
"Found %d reference(s) to block %llu (0x%llx) as %s in %s inode #%llu (0x"
"%llx)\n"
msgstr ""
-#: gfs2/fsck/util.c:403
+#: gfs2/fsck/util.c:399
msgid "valid"
msgstr ""
-#: gfs2/fsck/util.c:403
+#: gfs2/fsck/util.c:399
msgid "invalid"
msgstr ""
-#: gfs2/fsck/util.c:407
+#: gfs2/fsck/util.c:403
msgid "This is the original reference.\n"
msgstr ""
-#: gfs2/fsck/util.c:409
+#: gfs2/fsck/util.c:405
#, c-format
msgid "This brings the total to: %d duplicate references\n"
msgstr ""
-#: gfs2/fsck/util.c:434
+#: gfs2/fsck/util.c:430
msgid "Unable to allocate dir_info structure\n"
msgstr ""
-#: gfs2/fsck/util.c:438
-msgid "Error while zeroing dir_info structure\n"
-msgstr ""
-
-#: gfs2/fsck/util.c:494
+#: gfs2/fsck/util.c:486
#, c-format
msgid ""
"Removing duplicate reference to block %llu (0x%llx) referenced as %s by "
"dinode %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/util.c:622
+#: gfs2/fsck/util.c:611
msgid "directory"
msgstr ""
-#: gfs2/fsck/util.c:629
+#: gfs2/fsck/util.c:618
msgid "file"
msgstr ""
-#: gfs2/fsck/util.c:633
+#: gfs2/fsck/util.c:622
msgid "symlink"
msgstr ""
-#: gfs2/fsck/util.c:638
+#: gfs2/fsck/util.c:627
msgid "block device"
msgstr ""
-#: gfs2/fsck/util.c:643
+#: gfs2/fsck/util.c:632
msgid "character device"
msgstr ""
-#: gfs2/fsck/util.c:648
+#: gfs2/fsck/util.c:637
msgid "fifo"
msgstr ""
-#: gfs2/fsck/util.c:653
+#: gfs2/fsck/util.c:642
msgid "socket"
msgstr ""
-#: gfs2/fsck/util.c:658 gfs2/fsck/pass1.c:1102
+#: gfs2/fsck/util.c:647 gfs2/fsck/pass1.c:1104
msgid "invalid mode"
msgstr ""
-#: gfs2/fsck/util.c:759
+#: gfs2/fsck/util.c:748
#, c-format
msgid "This was the last reference: 0x%llx is no longer a duplicate.\n"
msgstr ""
-#: gfs2/fsck/util.c:764
+#: gfs2/fsck/util.c:753
#, c-format
msgid "%d references remain to 0x%llx\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:26
+#: gfs2/fsck/lost_n_found.c:27
#, c-format
msgid ""
"Adding .. entry to directory %llu (0x%llx) pointing back to lost+found\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:37
+#: gfs2/fsck/lost_n_found.c:38
#, c-format
msgid "Directory (0x%llx) already had a \"..\" link to (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:46
+#: gfs2/fsck/lost_n_found.c:47
msgid ".. unlinked, moving to lost+found"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:50
+#: gfs2/fsck/lost_n_found.c:51
#, c-format
msgid "Decrementing its links to %d\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:54
+#: gfs2/fsck/lost_n_found.c:55
msgid "Its link count is zero.\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:56
+#: gfs2/fsck/lost_n_found.c:57
#, c-format
msgid "Its link count is %d! Changing it to 0.\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:63
+#: gfs2/fsck/lost_n_found.c:64
#, c-format
msgid ""
"Directory (0x%llx)'s link to parent (0x%llx) had a formal inode discrepancy: "
"was 0x%llx, expected 0x%llx\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:70
+#: gfs2/fsck/lost_n_found.c:71
msgid "The parent directory was not changed.\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:76
+#: gfs2/fsck/lost_n_found.c:77
#, c-format
msgid ""
"Couldn't find a valid \"..\" entry for orphan directory (0x%llx): '..' = 0x"
"%llx\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:82
+#: gfs2/fsck/lost_n_found.c:83
#, c-format
msgid "Couldn't find directory (0x%llx) in directory tree.\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:87
+#: gfs2/fsck/lost_n_found.c:88
msgid "add_inode_to_lf: Unable to remove \"..\" directory entry.\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:93
+#: gfs2/fsck/lost_n_found.c:94
#, c-format
msgid "Error adding .. directory: %s\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:109
+#: gfs2/fsck/lost_n_found.c:110
msgid "Locating/Creating lost+found directory\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:123
+#: gfs2/fsck/lost_n_found.c:124
#, c-format
msgid "Error creating lost+found: %s\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:142
+#: gfs2/fsck/lost_n_found.c:143
msgid "lost+found dinode"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:145
+#: gfs2/fsck/lost_n_found.c:146
msgid "root"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:153
+#: gfs2/fsck/lost_n_found.c:154
#, c-format
msgid "lost+found directory is dinode %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:158
+#: gfs2/fsck/lost_n_found.c:159
msgid "Marking lost+found inode connected\n"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:183
+#: gfs2/fsck/lost_n_found.c:184
msgid "Trying to add lost+found to itself...skipping"
msgstr ""
-#: gfs2/fsck/lost_n_found.c:255
+#: gfs2/fsck/lost_n_found.c:256
#, c-format
msgid "Added inode #%llu (0x%llx) to lost+found\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:27
+#: gfs2/fsck/rgrepair.c:28
#, c-format
msgid "rindex #%d "
msgstr ""
-#: gfs2/fsck/rgrepair.c:55
+#: gfs2/fsck/rgrepair.c:56
#, c-format
msgid "Checking for rgrps in journal%d.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:64
+#: gfs2/fsck/rgrepair.c:65
#, c-format
msgid "False rgrp found at block 0x%llx\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:111
+#: gfs2/fsck/rgrepair.c:112
#, c-format
msgid "rgrp found at block 0x%llx\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:133
+#: gfs2/fsck/rgrepair.c:134
msgid "(shortest so far)\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:149
+#: gfs2/fsck/rgrepair.c:150
#, c-format
msgid "First rgrp distance: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:150
+#: gfs2/fsck/rgrepair.c:151
#, c-format
msgid "Distance between rgrps: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:160
+#: gfs2/fsck/rgrepair.c:161
msgid "rgrp 2 is damaged: getting dist from index: "
msgstr ""
-#: gfs2/fsck/rgrepair.c:165
+#: gfs2/fsck/rgrepair.c:166
msgid "rgrp index 2 is damaged: extrapolating dist: "
msgstr ""
-#: gfs2/fsck/rgrepair.c:171
+#: gfs2/fsck/rgrepair.c:172
#, c-format
msgid "Adjusted first rgrp distance: 0x%llx\n"
msgstr ""
@@ -3434,718 +3587,731 @@ msgid ""
"another method.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:520 gfs2/fsck/rgrepair.c:574
+#: gfs2/fsck/rgrepair.c:517 gfs2/fsck/rgrepair.c:571
#, c-format
msgid "Prev ri_data set to: %lx.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:525
+#: gfs2/fsck/rgrepair.c:522
#, c-format
msgid " rgrp %d at block 0x%llx intact"
msgstr ""
-#: gfs2/fsck/rgrepair.c:528
+#: gfs2/fsck/rgrepair.c:525
#, c-format
msgid "* rgrp %d at block 0x%llx *** DAMAGED ***"
msgstr ""
-#: gfs2/fsck/rgrepair.c:551 gfs2/fsck/rgrepair.c:554
+#: gfs2/fsck/rgrepair.c:548 gfs2/fsck/rgrepair.c:551
#, c-format
msgid " [length 0x%llx]\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:581
+#: gfs2/fsck/rgrepair.c:578
msgid "rindex rebuilt as follows:\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:648
+#: gfs2/fsck/rgrepair.c:627
#, c-format
msgid "rgsize must be: %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:658
+#: gfs2/fsck/rgrepair.c:639
#, c-format
msgid "fs_total_size = 0x%llx blocks.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:660
+#: gfs2/fsck/rgrepair.c:641
#, c-format
msgid "L3: number of rgs in the index = %d.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:674
+#: gfs2/fsck/rgrepair.c:655
#, c-format
msgid "Block #%lld (0x%llx) (%d of %d) is not %s.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:678
+#: gfs2/fsck/rgrepair.c:659
msgid "Fix the Resource Group? (y/n)"
msgstr ""
-#: gfs2/fsck/rgrepair.c:679
+#: gfs2/fsck/rgrepair.c:660
msgid "Attempting to repair the rgrp.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:766
+#: gfs2/fsck/rgrepair.c:745
msgid "The rindex file does not meet our expectations.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:792 gfs2/fsck/rgrepair.c:804
+#: gfs2/fsck/rgrepair.c:771 gfs2/fsck/rgrepair.c:783
msgid "Error rebuilding rgrp list.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:814
+#: gfs2/fsck/rgrepair.c:793
msgid "WARNING: rindex file is corrupt.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:819
+#: gfs2/fsck/rgrepair.c:798
#, c-format
msgid "L%d: number of rgs expected = %lld.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:822
+#: gfs2/fsck/rgrepair.c:801
#, c-format
msgid "L%d: They don't match; either (1) the fs was extended, (2) an odd\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:824
+#: gfs2/fsck/rgrepair.c:803
#, c-format
msgid "L%d: rgrp size was used, or (3) we have a corrupt rg index.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:850
+#: gfs2/fsck/rgrepair.c:829
#, c-format
msgid "%d addr: 0x%llx < 0x%llx * mismatch\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:857
+#: gfs2/fsck/rgrepair.c:836
#, c-format
msgid "%d addr: 0x%llx > 0x%llx * mismatch\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:867
+#: gfs2/fsck/rgrepair.c:846
#, c-format
msgid "%d addr: 0x%llx 0x%llx * has mismatch\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:878
+#: gfs2/fsck/rgrepair.c:857
#, c-format
msgid "Level %d didn't work. Too many discrepancies.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:880
+#: gfs2/fsck/rgrepair.c:859
#, c-format
msgid "%d out of %d rgrps (%d percent) did not match what was expected.\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:905
+#: gfs2/fsck/rgrepair.c:884
#, c-format
msgid "Entry missing from rindex: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:910
+#: gfs2/fsck/rgrepair.c:889
msgid "Out of memory!\n"
msgstr ""
-#: gfs2/fsck/rgrepair.c:929
+#: gfs2/fsck/rgrepair.c:908
msgid "Fix the index? (y/n)"
msgstr ""
-#: gfs2/fsck/rgrepair.c:950
+#: gfs2/fsck/rgrepair.c:929
msgid "rindex not fixed.\n"
msgstr ""
-#: gfs2/fsck/main.c:60
+#: gfs2/fsck/main.c:65
#, c-format
msgid "GFS2 fsck %s (built %s %s)\n"
msgstr ""
-#: gfs2/fsck/main.c:108
+#: gfs2/fsck/main.c:113
#, c-format
msgid "Invalid option %c\n"
msgstr ""
-#: gfs2/fsck/main.c:120
+#: gfs2/fsck/main.c:125
#, c-format
msgid "No device specified (Please use '-h' for help)\n"
msgstr ""
-#: gfs2/fsck/main.c:132
+#: gfs2/fsck/main.c:137
#, c-format
msgid "progress unknown.\n"
msgstr ""
-#: gfs2/fsck/main.c:134
+#: gfs2/fsck/main.c:139
#, c-format
msgid "processing block %llu out of %llu\n"
msgstr ""
-#: gfs2/fsck/main.c:139
+#: gfs2/fsck/main.c:144
msgid ""
"Do you want to abort gfs2_fsck, skip the rest of this pass or continue (a/s/"
"c)?"
msgstr ""
-#: gfs2/fsck/main.c:189
+#: gfs2/fsck/main.c:194
msgid "The statfs file is accurate.\n"
msgstr ""
-#: gfs2/fsck/main.c:192
+#: gfs2/fsck/main.c:197
msgid ""
"The statfs file is wrong:\n"
"\n"
msgstr ""
-#: gfs2/fsck/main.c:193
+#: gfs2/fsck/main.c:198
msgid "Current statfs values:\n"
msgstr ""
-#: gfs2/fsck/main.c:194 gfs2/fsck/main.c:205
+#: gfs2/fsck/main.c:199 gfs2/fsck/main.c:210
#, c-format
msgid "blocks: %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/main.c:197 gfs2/fsck/main.c:208
+#: gfs2/fsck/main.c:202 gfs2/fsck/main.c:213
#, c-format
msgid "free: %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/main.c:200
+#: gfs2/fsck/main.c:205
#, c-format
msgid ""
"dinodes: %lld (0x%llx)\n"
"\n"
msgstr ""
-#: gfs2/fsck/main.c:204
+#: gfs2/fsck/main.c:209
msgid "Calculated statfs values:\n"
msgstr ""
-#: gfs2/fsck/main.c:211
+#: gfs2/fsck/main.c:216
#, c-format
msgid "dinodes: %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/main.c:216
+#: gfs2/fsck/main.c:221
msgid "Okay to fix the master statfs file? (y/n)"
msgstr ""
-#: gfs2/fsck/main.c:217
+#: gfs2/fsck/main.c:222
msgid "The statfs file was not fixed.\n"
msgstr ""
-#: gfs2/fsck/main.c:222
+#: gfs2/fsck/main.c:227
msgid "The statfs file was fixed.\n"
msgstr ""
-#: gfs2/fsck/main.c:251
+#: gfs2/fsck/main.c:259
#, c-format
msgid "Starting %s\n"
msgstr ""
-#: gfs2/fsck/main.c:257
+#: gfs2/fsck/main.c:266
#, c-format
msgid "%s interrupted \n"
msgstr ""
-#: gfs2/fsck/main.c:260
+#: gfs2/fsck/main.c:273
#, c-format
-msgid "%s complete \n"
+msgid "%s completed in "
msgstr ""
-#: gfs2/fsck/main.c:282
+#: gfs2/fsck/main.c:334
msgid "Initializing fsck\n"
msgstr ""
-#: gfs2/fsck/main.c:287
+#: gfs2/fsck/main.c:339
#, c-format
msgid "%s: clean.\n"
msgstr ""
-#: gfs2/fsck/main.c:317
+#: gfs2/fsck/main.c:369
msgid "Writing changes to disk\n"
msgstr ""
-#: gfs2/fsck/main.c:321
+#: gfs2/fsck/main.c:373
msgid ""
"Superblock was reset. Use tunegfs2 to manually set lock table before "
"mounting.\n"
msgstr ""
-#: gfs2/fsck/main.c:323
+#: gfs2/fsck/main.c:375
msgid "gfs2_fsck complete\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:125
+#: gfs2/fsck/fs_recovery.c:127
#, c-format
msgid "Journal replay writing metadata block #%lld (0x%llx) for journal+0x%x\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:131 gfs2/fsck/fs_recovery.c:243
+#: gfs2/fsck/fs_recovery.c:133 gfs2/fsck/fs_recovery.c:245
msgid "Out of memory when replaying journals.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:183
+#: gfs2/fsck/fs_recovery.c:185
#, c-format
msgid ""
"Journal replay processing revoke for block #%lld (0x%llx) for journal+0x%x\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:237
+#: gfs2/fsck/fs_recovery.c:239
#, c-format
msgid "Journal replay writing data block #%lld (0x%llx) for journal+0x%x\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:390
+#: gfs2/fsck/fs_recovery.c:392
#, c-format
msgid "Journal block %u (0x%x): sequence no. 0x%llx out of order.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:392
+#: gfs2/fsck/fs_recovery.c:394
#, c-format
msgid "Low: 0x%llx, High: 0x%llx, Prev: 0x%llx\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:399
+#: gfs2/fsck/fs_recovery.c:401
#, c-format
msgid "Renumbering it as 0x%llx\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:453
+#: gfs2/fsck/fs_recovery.c:455
#, c-format
msgid "jid=%u: Looking at journal...\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:459
+#: gfs2/fsck/fs_recovery.c:461
#, c-format
msgid "Journal #%d (\"journal%d\") is corrupt\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:460
+#: gfs2/fsck/fs_recovery.c:462
msgid "Not fixing it due to the -n option.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:464
+#: gfs2/fsck/fs_recovery.c:466
#, c-format
msgid "Journal #%d (\"journal%d\") is corrupt.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:466
+#: gfs2/fsck/fs_recovery.c:468
msgid ""
"I'm not fixing it because it may be unsafe:\n"
"Locking protocol is not lock_nolock and the -a or -p option was specified.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:469 gfs2/fsck/fs_recovery.c:512
+#: gfs2/fsck/fs_recovery.c:471 gfs2/fsck/fs_recovery.c:514
msgid ""
"Please make sure no node has the file system mounted then rerun fsck.gfs2 "
"manually without -a or -p.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:474
+#: gfs2/fsck/fs_recovery.c:476
#, c-format
msgid ""
"\n"
"Journal #%d (\"journal%d\") is corrupt. Okay to repair it? (y/n)"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:477
+#: gfs2/fsck/fs_recovery.c:479
#, c-format
msgid "jid=%u: The journal was not repaired.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:481
+#: gfs2/fsck/fs_recovery.c:483
#, c-format
msgid "jid=%u: Repairing journal...\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:484 gfs2/fsck/fs_recovery.c:490
+#: gfs2/fsck/fs_recovery.c:486 gfs2/fsck/fs_recovery.c:492
#, c-format
msgid "jid=%u: Unable to fix the bad journal.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:494
+#: gfs2/fsck/fs_recovery.c:496
#, c-format
msgid "jid=%u: The journal was successfully fixed.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:498
+#: gfs2/fsck/fs_recovery.c:500
#, c-format
msgid "jid=%u: Journal is clean.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:503 gfs2/fsck/fs_recovery.c:508
+#: gfs2/fsck/fs_recovery.c:505 gfs2/fsck/fs_recovery.c:510
#, c-format
msgid "Journal #%d (\"journal%d\") is dirty\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:504
+#: gfs2/fsck/fs_recovery.c:506
msgid "not replaying due to the -n option.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:509
+#: gfs2/fsck/fs_recovery.c:511
msgid ""
"I'm not replaying it because it may be unsafe:\n"
"Locking protocol is not lock_nolock and the -a or -p option was specified.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:518
+#: gfs2/fsck/fs_recovery.c:520
#, c-format
msgid ""
"\n"
"Journal #%d (\"journal%d\") is dirty. Okay to replay it? (y/n)"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:522
+#: gfs2/fsck/fs_recovery.c:524
#, c-format
msgid "jid=%u: Replaying journal...\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:534
+#: gfs2/fsck/fs_recovery.c:536
#, c-format
msgid "jid=%u: Found %u revoke tags\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:539
+#: gfs2/fsck/fs_recovery.c:541
#, c-format
msgid "jid=%u: Replayed %u of %u journaled data blocks\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:541
+#: gfs2/fsck/fs_recovery.c:543
#, c-format
msgid "jid=%u: Replayed %u of %u metadata blocks\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:548
+#: gfs2/fsck/fs_recovery.c:550
#, c-format
msgid "jid=%u: Done\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:551
+#: gfs2/fsck/fs_recovery.c:553
#, c-format
msgid "jid=%u: Failed\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:553
+#: gfs2/fsck/fs_recovery.c:555
msgid "Do you want to clear the journal instead? (y/n)"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:558
+#: gfs2/fsck/fs_recovery.c:560
#, c-format
msgid "jid=%u: journal not cleared.\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:587
+#: gfs2/fsck/fs_recovery.c:569
#, c-format
msgid ""
-"File system journal \"journal%d\" is missing: pass1 will try to recreate "
-"it.\n"
+"Bad block pointer (out of range) found in journal inode %lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/fs_recovery.c:607
+#: gfs2/fsck/fs_recovery.c:593
+#, c-format
+msgid ""
+"Journal at block %lld (0x%llx) has a bad indirect block pointer %lld (0x"
+"%llx) (points to something that is not an indirect block).\n"
+msgstr ""
+
+#: gfs2/fsck/fs_recovery.c:675
+#, c-format
+msgid ""
+"File system journal \"journal%d\" is missing or corrupt: pass1 will try to "
+"recreate it.\n"
+msgstr ""
+
+#: gfs2/fsck/fs_recovery.c:696
msgid "Recovering journals (this may take a while)\n"
msgstr ""
-#: gfs2/fsck/link.c:46
+#: gfs2/fsck/link.c:47
#, c-format
msgid "Dir (0x%llx) incremented counted links to %u for (0x%llx) via %s\n"
msgstr ""
-#: gfs2/fsck/link.c:53
+#: gfs2/fsck/link.c:54
#, c-format
msgid "Ref: (0x%llx) No match found when incrementing link for (0x%llx)!\n"
msgstr ""
-#: gfs2/fsck/link.c:77
+#: gfs2/fsck/link.c:78
#, c-format
msgid "Dir (0x%llx)'s link to (0x%llx) via %s is zero!\n"
msgstr ""
-#: gfs2/fsck/link.c:84
+#: gfs2/fsck/link.c:85
#, c-format
msgid "Dir (0x%llx) decremented counted links to %u for (0x%llx) via %s\n"
msgstr ""
-#: gfs2/fsck/link.c:91
+#: gfs2/fsck/link.c:92
#, c-format
msgid "No match found when decrementing link for (0x%llx)!\n"
msgstr ""
-#: gfs2/fsck/pass4.c:28
+#: gfs2/fsck/pass4.c:29
#, c-format
msgid "Fixing inode link count (%d->%d) for %llu (0x%llx) \n"
msgstr ""
-#: gfs2/fsck/pass4.c:37
+#: gfs2/fsck/pass4.c:38
#, c-format
msgid "Changing inode %llu (0x%llx) to have %u links\n"
msgstr ""
-#: gfs2/fsck/pass4.c:58
+#: gfs2/fsck/pass4.c:59
msgid "osi_tree broken in scan_info_list!!\n"
msgstr ""
-#: gfs2/fsck/pass4.c:69
+#: gfs2/fsck/pass4.c:70
#, c-format
msgid "Found unlinked inode at %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass4.c:74
+#: gfs2/fsck/pass4.c:75
#, c-format
msgid "Unlinked inode %llu (0x%llx) contains bad blocks\n"
msgstr ""
-#: gfs2/fsck/pass4.c:78
+#: gfs2/fsck/pass4.c:79
msgid "Delete unlinked inode with bad blocks? (y/n) "
msgstr ""
-#: gfs2/fsck/pass4.c:85
+#: gfs2/fsck/pass4.c:86
msgid "bad unlinked"
msgstr ""
-#: gfs2/fsck/pass4.c:90
+#: gfs2/fsck/pass4.c:91
msgid "Unlinked inode with bad blocks not cleared\n"
msgstr ""
-#: gfs2/fsck/pass4.c:98
+#: gfs2/fsck/pass4.c:99
#, c-format
msgid "Unlinked block %lld (0x%llx) marked as inode is not an inode (%d)\n"
msgstr ""
-#: gfs2/fsck/pass4.c:104
+#: gfs2/fsck/pass4.c:105
msgid "Delete unlinked inode? (y/n) "
msgstr ""
-#: gfs2/fsck/pass4.c:109
+#: gfs2/fsck/pass4.c:110
msgid "invalid unlinked"
msgstr ""
-#: gfs2/fsck/pass4.c:112
+#: gfs2/fsck/pass4.c:113
msgid "The inode was deleted\n"
msgstr ""
-#: gfs2/fsck/pass4.c:114
+#: gfs2/fsck/pass4.c:115
msgid "The inode was not deleted\n"
msgstr ""
-#: gfs2/fsck/pass4.c:126
+#: gfs2/fsck/pass4.c:127
msgid "Unlinked inode has zero size\n"
msgstr ""
-#: gfs2/fsck/pass4.c:127
+#: gfs2/fsck/pass4.c:128
msgid "Clear zero-size unlinked inode? (y/n) "
msgstr ""
-#: gfs2/fsck/pass4.c:130
+#: gfs2/fsck/pass4.c:131
msgid "unlinked zero-length"
msgstr ""
-#: gfs2/fsck/pass4.c:137
+#: gfs2/fsck/pass4.c:138
msgid "Add unlinked inode to lost+found? (y/n)"
msgstr ""
-#: gfs2/fsck/pass4.c:148
+#: gfs2/fsck/pass4.c:149
msgid "Unlinked inode left unlinked\n"
msgstr ""
-#: gfs2/fsck/pass4.c:152
+#: gfs2/fsck/pass4.c:153
#, c-format
msgid ""
"Link count inconsistent for inode %llu (0x%llx) has %u but fsck found %u.\n"
msgstr ""
-#: gfs2/fsck/pass4.c:159
+#: gfs2/fsck/pass4.c:160
#, c-format
msgid "Update link count for inode %llu (0x%llx) ? (y/n) "
msgstr ""
-#: gfs2/fsck/pass4.c:167
+#: gfs2/fsck/pass4.c:168
#, c-format
msgid "Link count updated to %d for inode %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass4.c:173
+#: gfs2/fsck/pass4.c:174
#, c-format
msgid "Link count for inode %llu (0x%llx) still incorrect\n"
msgstr ""
-#: gfs2/fsck/pass4.c:179
+#: gfs2/fsck/pass4.c:180
#, c-format
msgid "block %llu (0x%llx) has link count %d\n"
msgstr ""
-#: gfs2/fsck/pass4.c:186
+#: gfs2/fsck/pass4.c:187
msgid "Unable to find lost+found inode in inode_hash!!\n"
msgstr ""
-#: gfs2/fsck/pass4.c:208
+#: gfs2/fsck/pass4.c:209
#, c-format
msgid "At beginning of pass4, lost+found entries is %u\n"
msgstr ""
-#: gfs2/fsck/pass4.c:210
+#: gfs2/fsck/pass4.c:211
msgid "Checking inode reference counts.\n"
msgstr ""
-#: gfs2/fsck/pass4.c:217
+#: gfs2/fsck/pass4.c:218
#, c-format
msgid "At end of pass4, lost+found entries is %u\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:35
+#: gfs2/fsck/pass1c.c:36
#, c-format
msgid "Bad Extended Attribute at block #%llu (0x%llx) removed.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:49
+#: gfs2/fsck/pass1c.c:50
msgid "Remove the bad Extended Attribute entry? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1c.c:63 gfs2/fsck/pass1c.c:76
+#: gfs2/fsck/pass1c.c:64 gfs2/fsck/pass1c.c:77
msgid "Bad Extended Attribute not removed.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:70
+#: gfs2/fsck/pass1c.c:71
msgid "Remove the bad Extended Attribute? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1c.c:73
+#: gfs2/fsck/pass1c.c:74
msgid "Bad Extended Attribute removed.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:89
+#: gfs2/fsck/pass1c.c:90
#, c-format
msgid ""
"Extended attributes indirect block #%llu (0x%llx) for inode #%llu (0x%llx) "
"is invalid...removing\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:100
+#: gfs2/fsck/pass1c.c:101
#, c-format
msgid ""
"Extended attributes indirect block #%llu (0x%llx) for inode #%llu (0x%llx) "
"is invalid.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:124
+#: gfs2/fsck/pass1c.c:125
#, c-format
msgid "Extended attributes block for inode #%llu (0x%llx) is invalid.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:132
+#: gfs2/fsck/pass1c.c:133
#, c-format
msgid "Extended attributes block for inode #%llu (0x%llx) invalid.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:157 gfs2/fsck/pass1c.c:173
+#: gfs2/fsck/pass1c.c:158 gfs2/fsck/pass1c.c:174
msgid "EA has name length of zero\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:162
+#: gfs2/fsck/pass1c.c:163
msgid "EA rec length too long\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:168
+#: gfs2/fsck/pass1c.c:169
msgid "last EA has no last entry flag\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:184
+#: gfs2/fsck/pass1c.c:185
#, c-format
msgid "EA (%s) type is invalid (%d > %d).\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:198
+#: gfs2/fsck/pass1c.c:199
#, c-format
msgid "EA (%s) has incorrect number of pointers.\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:199
+#: gfs2/fsck/pass1c.c:200
#, c-format
msgid ""
" Required: %d\n"
" Reported: %d\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:204
+#: gfs2/fsck/pass1c.c:205
#, c-format
msgid ""
" Pointers Required: %d\n"
" Pointers Reported: %d\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:248
+#: gfs2/fsck/pass1c.c:249
msgid "Looking for inodes containing ea blocks...\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:258
+#: gfs2/fsck/pass1c.c:259
#, c-format
msgid "EA in inode %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1c.c:265
+#: gfs2/fsck/pass1c.c:266
#, c-format
msgid "Found eattr at %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:45 gfs2/fsck/pass1b.c:104
+#: gfs2/fsck/pass1b.c:46 gfs2/fsck/pass1b.c:105
msgid "Invalid "
msgstr ""
-#: gfs2/fsck/pass1b.c:46
+#: gfs2/fsck/pass1b.c:47
#, c-format
msgid ""
"Inode %s (%lld/0x%llx) has %d reference(s) to block %llu (0x%llx) (%s)\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:118
+#: gfs2/fsck/pass1b.c:119
#, c-format
msgid ""
"Inode %s (%lld/0x%llx)'s reference to block %llu (0x%llx) as '%s' is "
"acceptable.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:138
+#: gfs2/fsck/pass1b.c:139
#, c-format
msgid ""
"Inode %s (%lld/0x%llx) references block %llu (0x%llx) as '%s', but the block "
"is really %s.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:146
+#: gfs2/fsck/pass1b.c:147
#, c-format
msgid "Okay to delete %s inode %lld (0x%llx)? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1b.c:148
+#: gfs2/fsck/pass1b.c:149
msgid "invalidated"
msgstr ""
-#: gfs2/fsck/pass1b.c:151
+#: gfs2/fsck/pass1b.c:152
msgid "The bad inode was not cleared."
msgstr ""
-#: gfs2/fsck/pass1b.c:161
+#: gfs2/fsck/pass1b.c:162
#, c-format
msgid "Inode %lld (0x%llx) was previously deleted.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:166
+#: gfs2/fsck/pass1b.c:167
#, c-format
msgid "Pass1b is deleting inode %lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:186
+#: gfs2/fsck/pass1b.c:187
msgid "duplicate referencing bad"
msgstr ""
-#: gfs2/fsck/pass1b.c:272
+#: gfs2/fsck/pass1b.c:273
#, c-format
msgid ""
"Block %llu (0x%llx) has %d inodes referencing it for a total of %d duplicate "
"references:\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:329
+#: gfs2/fsck/pass1b.c:330
#, c-format
msgid ""
"----------------------------------------------\n"
@@ -4153,7 +4319,7 @@ msgid ""
"marked invalid.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:345
+#: gfs2/fsck/pass1b.c:346
#, c-format
msgid ""
"----------------------------------------------\n"
@@ -4161,20 +4327,20 @@ msgid ""
"block type.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:359
+#: gfs2/fsck/pass1b.c:360
#, c-format
msgid ""
"----------------------------------------------\n"
"Step 3: Choose one reference to block %llu (0x%llx) to keep.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:374
+#: gfs2/fsck/pass1b.c:375
#, c-format
msgid ""
"Block %llu (0x%llx) has only one remaining valid inode referencing it.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:385
+#: gfs2/fsck/pass1b.c:386
#, c-format
msgid ""
"----------------------------------------------\n"
@@ -4182,682 +4348,682 @@ msgid ""
"%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:394
+#: gfs2/fsck/pass1b.c:395
#, c-format
msgid ""
"The remaining reference inode %lld (0x%llx) is marked invalid: Marking the "
"block as free.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:400 gfs2/fsck/pass1b.c:411
+#: gfs2/fsck/pass1b.c:401 gfs2/fsck/pass1b.c:412
msgid "reference-repaired leaf"
msgstr ""
-#: gfs2/fsck/pass1b.c:406
+#: gfs2/fsck/pass1b.c:407
msgid "reference-repaired data"
msgstr ""
-#: gfs2/fsck/pass1b.c:415
+#: gfs2/fsck/pass1b.c:416
msgid "reference-repaired indirect"
msgstr ""
-#: gfs2/fsck/pass1b.c:420
+#: gfs2/fsck/pass1b.c:421
msgid "reference-repaired extended attribute"
msgstr ""
-#: gfs2/fsck/pass1b.c:424
+#: gfs2/fsck/pass1b.c:425
#, c-format
msgid "Done with duplicate reference to block 0x%llx\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:429
+#: gfs2/fsck/pass1b.c:430
#, c-format
msgid "All duplicate references to block 0x%llx were processed.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:432
+#: gfs2/fsck/pass1b.c:433
#, c-format
msgid ""
"Done with duplicate reference to block 0x%llx, but %d references remain.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:436
+#: gfs2/fsck/pass1b.c:437
#, c-format
msgid "Block %llu (0x%llx) has no more references; Marking as 'free'.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:542
+#: gfs2/fsck/pass1b.c:543
#, c-format
msgid "Block %lld (0x%llx) is not gfs2 metadata.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:576
+#: gfs2/fsck/pass1b.c:577
msgid "Looking for duplicate blocks...\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:580
+#: gfs2/fsck/pass1b.c:581
msgid "No duplicate blocks found\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:586
+#: gfs2/fsck/pass1b.c:587
msgid "Scanning filesystem for inodes containing duplicate blocks...\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:587
+#: gfs2/fsck/pass1b.c:588
#, c-format
msgid "Filesystem has %llu (0x%llx) blocks total\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:595
+#: gfs2/fsck/pass1b.c:596
#, c-format
msgid "Found all %d original references to duplicates.\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:607
+#: gfs2/fsck/pass1b.c:608
#, c-format
msgid "Checking invalidated duplicate dinode %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1b.c:622
+#: gfs2/fsck/pass1b.c:623
msgid "Handling duplicate blocks\n"
msgstr ""
-#: gfs2/fsck/pass5.c:53 gfs2/fsck/pass5.c:97
+#: gfs2/fsck/pass5.c:54 gfs2/fsck/pass5.c:98
#, c-format
msgid "Invalid block type %d found\n"
msgstr ""
-#: gfs2/fsck/pass5.c:92
+#: gfs2/fsck/pass5.c:93
#, c-format
msgid "Invalid freemeta type %d found\n"
msgstr ""
-#: gfs2/fsck/pass5.c:133
+#: gfs2/fsck/pass5.c:134
#, c-format
msgid "Invalid status for block %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass5.c:145
+#: gfs2/fsck/pass5.c:146
#, c-format
msgid "Unlinked inode found at block %llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass5.c:149
+#: gfs2/fsck/pass5.c:150
msgid "Do you want to reclaim the block? (y/n) "
msgstr ""
-#: gfs2/fsck/pass5.c:152
+#: gfs2/fsck/pass5.c:154
#, c-format
msgid "Unlinked block %llu (0x%llx) bitmap not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass5.c:158
+#: gfs2/fsck/pass5.c:160
#, c-format
msgid "Unlinked block %llu (0x%llx) bitmap fixed.\n"
msgstr ""
-#: gfs2/fsck/pass5.c:163
+#: gfs2/fsck/pass5.c:165
#, c-format
msgid "Unlinked block found at block %llu (0x%llx), left unchanged.\n"
msgstr ""
-#: gfs2/fsck/pass5.c:172
+#: gfs2/fsck/pass5.c:174
#, c-format
msgid "Block %llu (0x%llx) bitmap says %u (%s) but FSCK saw %u (%s)\n"
msgstr ""
-#: gfs2/fsck/pass5.c:179
+#: gfs2/fsck/pass5.c:181
#, c-format
msgid "Metadata type is %u (%s)\n"
msgstr ""
-#: gfs2/fsck/pass5.c:182
+#: gfs2/fsck/pass5.c:184
#, c-format
msgid "Fix bitmap for block %llu (0x%llx) ? (y/n) "
msgstr ""
-#: gfs2/fsck/pass5.c:186
+#: gfs2/fsck/pass5.c:189
msgid "Repair failed.\n"
msgstr ""
-#: gfs2/fsck/pass5.c:188
+#: gfs2/fsck/pass5.c:191
msgid "Fixed.\n"
msgstr ""
-#: gfs2/fsck/pass5.c:190
+#: gfs2/fsck/pass5.c:193
#, c-format
msgid "Bitmap at block %llu (0x%llx) left inconsistent\n"
msgstr ""
-#: gfs2/fsck/pass5.c:228
+#: gfs2/fsck/pass5.c:230
#, c-format
msgid "RG #%llu (0x%llx) free count inconsistent: is %u should be %u\n"
msgstr ""
-#: gfs2/fsck/pass5.c:237
+#: gfs2/fsck/pass5.c:239
#, c-format
msgid "RG #%llu (0x%llx) Inode count inconsistent: is %u should be %u\n"
msgstr ""
-#: gfs2/fsck/pass5.c:246
+#: gfs2/fsck/pass5.c:248
#, c-format
msgid ""
"RG #%llu (0x%llx) Used metadata count inconsistent: is %u should be %u\n"
msgstr ""
-#: gfs2/fsck/pass5.c:255
+#: gfs2/fsck/pass5.c:257
#, c-format
msgid ""
"RG #%llu (0x%llx) Free metadata count inconsistent: is %u should be %u\n"
msgstr ""
-#: gfs2/fsck/pass5.c:267
+#: gfs2/fsck/pass5.c:269
msgid "Internal fsck error - AAHHH!\n"
msgstr ""
-#: gfs2/fsck/pass5.c:271
+#: gfs2/fsck/pass5.c:273
msgid "Update resource group counts? (y/n) "
msgstr ""
-#: gfs2/fsck/pass5.c:272
+#: gfs2/fsck/pass5.c:274
msgid "Resource group counts updated\n"
msgstr ""
-#: gfs2/fsck/pass5.c:279
+#: gfs2/fsck/pass5.c:281
msgid "Resource group counts left inconsistent\n"
msgstr ""
-#: gfs2/fsck/pass5.c:301
+#: gfs2/fsck/pass5.c:303
#, c-format
msgid "Verifying Resource Group #%llu\n"
msgstr ""
-#: gfs2/fsck/pass1.c:137
+#: gfs2/fsck/pass1.c:138
msgid "itself"
msgstr ""
-#: gfs2/fsck/pass1.c:138
+#: gfs2/fsck/pass1.c:139
#, c-format
msgid ""
"Bad indirect block pointer (invalid or out of range) found in system inode "
"%lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:146 gfs2/fsck/pass1.c:200
+#: gfs2/fsck/pass1.c:147 gfs2/fsck/pass1.c:201
msgid "system file"
msgstr ""
-#: gfs2/fsck/pass1.c:181
+#: gfs2/fsck/pass1.c:182
#, c-format
msgid ""
"Block # referenced by system directory entry %s in inode %lld (0x%llx) is "
"invalid or out of range; ignored.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:226
+#: gfs2/fsck/pass1.c:227
#, c-format
msgid ""
"Found duplicate block #%llu (0x%llx) referenced as a directory leaf in "
"dinode %llu (0x%llx) - was marked %d (%s)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:264 gfs2/fsck/pass1.c:342
+#: gfs2/fsck/pass1.c:265 gfs2/fsck/pass1.c:343
msgid "bad block referencing"
msgstr ""
-#: gfs2/fsck/pass1.c:265
+#: gfs2/fsck/pass1.c:266
#, c-format
msgid ""
"Bad indirect block (invalid/out of range) found in inode %lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:274
+#: gfs2/fsck/pass1.c:275
msgid "a directory hash table block"
msgstr ""
-#: gfs2/fsck/pass1.c:277
+#: gfs2/fsck/pass1.c:278
msgid "a journaled data block"
msgstr ""
-#: gfs2/fsck/pass1.c:281
+#: gfs2/fsck/pass1.c:282
#, c-format
msgid ""
"Found duplicate block #%llu (0x%llx) referenced as metadata in indirect "
"block for dinode %llu (0x%llx) - was marked %d (%s)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:296
+#: gfs2/fsck/pass1.c:297
#, c-format
msgid ""
"Inode %lld (0x%llx) has a bad indirect block pointer %lld (0x%llx) (points "
"to something that is not %s).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:314
+#: gfs2/fsck/pass1.c:315
msgid "indirect"
msgstr ""
-#: gfs2/fsck/pass1.c:360
+#: gfs2/fsck/pass1.c:361
#, c-format
msgid ""
"Block %llu (0x%llx) is still referenced from another inode; not freeing.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:374
+#: gfs2/fsck/pass1.c:375
msgid "bad indirect"
msgstr ""
-#: gfs2/fsck/pass1.c:374
+#: gfs2/fsck/pass1.c:375
msgid "referenced data"
msgstr ""
-#: gfs2/fsck/pass1.c:422
+#: gfs2/fsck/pass1.c:423
#, c-format
msgid ""
"Inode %lld (0x%llx) has a reference to block %lld (0x%llx) as a data block, "
"but it appears to be a dinode we haven't checked yet.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:443
+#: gfs2/fsck/pass1.c:444
#, c-format
msgid ""
"inode %lld (0x%llx) has a bad data block pointer %lld (0x%llx) (invalid or "
"out of range) "
msgstr ""
-#: gfs2/fsck/pass1.c:451 gfs2/fsck/pass1.c:475
+#: gfs2/fsck/pass1.c:452 gfs2/fsck/pass1.c:476
#, c-format
msgid "from metadata block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:458
+#: gfs2/fsck/pass1.c:459
msgid "bad (out of range) data"
msgstr ""
-#: gfs2/fsck/pass1.c:465
+#: gfs2/fsck/pass1.c:466
#, c-format
msgid ""
"Found duplicate %s block %llu (0x%llx) referenced as data by dinode %llu (0x"
"%llx) "
msgstr ""
-#: gfs2/fsck/pass1.c:480
+#: gfs2/fsck/pass1.c:481
msgid ""
"The block was processed earlier as valid metadata, so it can't possibly be "
"data.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:492
+#: gfs2/fsck/pass1.c:493
msgid "Seems to be a normal duplicate; I'll sort it out in pass1b.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:500
+#: gfs2/fsck/pass1.c:501
msgid ""
"The block was invalid as metadata but might be okay as data. I'll sort it "
"out in pass1b.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:509
+#: gfs2/fsck/pass1.c:510
#, c-format
msgid "Block %lld (0x%llx) is a GFS1 rindex block\n"
msgstr ""
-#: gfs2/fsck/pass1.c:512
+#: gfs2/fsck/pass1.c:513
msgid "rgrp"
msgstr ""
-#: gfs2/fsck/pass1.c:515
+#: gfs2/fsck/pass1.c:516
#, c-format
msgid "Block %lld (0x%llx) is a GFS1 journaled data block\n"
msgstr ""
-#: gfs2/fsck/pass1.c:518
+#: gfs2/fsck/pass1.c:519
msgid "jdata"
msgstr ""
-#: gfs2/fsck/pass1.c:540
+#: gfs2/fsck/pass1.c:541
#, c-format
msgid "Inode %lld (0x%llx) has unrecoverable Extended Attribute errors.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:543
+#: gfs2/fsck/pass1.c:544
msgid "Clear all Extended Attributes from the inode? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:545
+#: gfs2/fsck/pass1.c:546
msgid "Extended attributes were removed.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:547
+#: gfs2/fsck/pass1.c:548
msgid "Unable to remove inode eattr pointer; the error remains.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:550
+#: gfs2/fsck/pass1.c:551
msgid "Extended attributes were not removed.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:567
+#: gfs2/fsck/pass1.c:568
#, c-format
msgid "Inode #%llu (0x%llx): %s"
msgstr ""
-#: gfs2/fsck/pass1.c:570
+#: gfs2/fsck/pass1.c:571
#, c-format
msgid " at block #%lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:572
+#: gfs2/fsck/pass1.c:573
msgid "Clear the bad Extended Attribute? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:575
+#: gfs2/fsck/pass1.c:576
msgid "The bad extended attribute was removed.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:579
+#: gfs2/fsck/pass1.c:580
msgid "bad extended attribute"
msgstr ""
-#: gfs2/fsck/pass1.c:583
+#: gfs2/fsck/pass1.c:584
msgid "The bad Extended Attribute was not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:617
+#: gfs2/fsck/pass1.c:618
msgid "Bad indirect Extended Attribute duplicate found"
msgstr ""
-#: gfs2/fsck/pass1.c:623
+#: gfs2/fsck/pass1.c:624
msgid "Extended Attribute indirect block has incorrect type"
msgstr ""
-#: gfs2/fsck/pass1.c:628
+#: gfs2/fsck/pass1.c:629
#, c-format
msgid ""
"Inode #%llu (0x%llx): Duplicate Extended Attribute indirect block found at #"
"%llu (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:640
+#: gfs2/fsck/pass1.c:641
msgid "indirect Extended Attribute"
msgstr ""
-#: gfs2/fsck/pass1.c:656
+#: gfs2/fsck/pass1.c:657
#, c-format
msgid "Marking inode #%llu (0x%llx) with extended attribute block\n"
msgstr ""
-#: gfs2/fsck/pass1.c:674
+#: gfs2/fsck/pass1.c:675
#, c-format
msgid ""
"Inode %lld (0x%llx) has recoverable indirect Extended Attribute errors.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:678
+#: gfs2/fsck/pass1.c:679
msgid "Okay to fix the block count for the inode? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:682
+#: gfs2/fsck/pass1.c:683
#, c-format
msgid "Block count fixed: 1+%lld+%lld+%lld = %lld.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:689
+#: gfs2/fsck/pass1.c:690
msgid "Block count not fixed.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:714
+#: gfs2/fsck/pass1.c:715
msgid "Bad Extended Attribute duplicate found"
msgstr ""
-#: gfs2/fsck/pass1.c:717
+#: gfs2/fsck/pass1.c:718
msgid "Extended Attribute leaf block has incorrect type"
msgstr ""
-#: gfs2/fsck/pass1.c:724
+#: gfs2/fsck/pass1.c:725
#, c-format
msgid "Duplicate block found at #%lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:737
+#: gfs2/fsck/pass1.c:738
msgid "Extended Attribute block removed due to previous errors.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:745
+#: gfs2/fsck/pass1.c:746
msgid "Extended Attribute"
msgstr ""
-#: gfs2/fsck/pass1.c:774
+#: gfs2/fsck/pass1.c:775
#, c-format
msgid ""
"Inode #%llu (0x%llx): Extended Attribute block %llu (0x%llx) has an extended "
"leaf block #%llu (0x%llx) that is invalid or out of range.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:784
+#: gfs2/fsck/pass1.c:785
msgid "bad (out of range) Extended Attribute "
msgstr ""
-#: gfs2/fsck/pass1.c:807
+#: gfs2/fsck/pass1.c:808
#, c-format
msgid "Setting inode %lld (0x%llx) as having eattr block(s) attached.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:818
+#: gfs2/fsck/pass1.c:819
#, c-format
msgid ""
"Inode #%llu (0x%llx): Extended Attribute leaf block #%llu (0x%llx) is "
"invalid or out of range.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:825
+#: gfs2/fsck/pass1.c:826
msgid "bad (out of range) Extended Attribute leaf"
msgstr ""
-#: gfs2/fsck/pass1.c:909
+#: gfs2/fsck/pass1.c:910
#, c-format
msgid ""
"%s block %lld (0x%llx), part of inode %lld (0x%llx), was previously "
"referenced so the invalid reference is ignored.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:991
+#: gfs2/fsck/pass1.c:992
#, c-format
msgid ""
"Bad %s block pointer (invalid or out of range #%ld) found in inode %lld (0x"
"%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1005
+#: gfs2/fsck/pass1.c:1006
#, c-format
msgid ""
"Duplicated %s block pointer (violation %ld, block %lld (0x%llx)) found in "
"inode %lld (0x%llx).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1083
+#: gfs2/fsck/pass1.c:1085
#, c-format
msgid "Error: inode %llu (0x%llx) has more than %d bad pointers.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1089
+#: gfs2/fsck/pass1.c:1091
msgid "badly corrupt"
msgstr ""
-#: gfs2/fsck/pass1.c:1137
+#: gfs2/fsck/pass1.c:1139
#, c-format
msgid ""
"Inode #%llu (0x%llx): Ondisk block count (%llu) does not match what fsck "
"found (%llu)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1144
+#: gfs2/fsck/pass1.c:1146
#, c-format
msgid ""
"inode has: %lld, but fsck counts: Dinode:1 + indir:%lld + data: %lld + ea: "
"%lld\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1150
+#: gfs2/fsck/pass1.c:1152
msgid "Fix ondisk block count? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:1154
+#: gfs2/fsck/pass1.c:1156
#, c-format
msgid "Block count for #%llu (0x%llx) fixed\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1158
+#: gfs2/fsck/pass1.c:1160
#, c-format
msgid "Bad block count for #%llu (0x%llx) not fixed\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1183
+#: gfs2/fsck/pass1.c:1185
#, c-format
msgid "Inode #%llu (0x%llx): Bad inode address found: %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1188
+#: gfs2/fsck/pass1.c:1190
#, c-format
msgid "Fix address in inode at block #%llu (0x%llx)? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:1194
+#: gfs2/fsck/pass1.c:1196
#, c-format
msgid "Address in inode at block #%llu (0x%llx) not fixed\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1200
+#: gfs2/fsck/pass1.c:1202
#, c-format
msgid ""
"Inode #%llu (0x%llx): GFS1 formal inode number mismatch: was %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1205
+#: gfs2/fsck/pass1.c:1207
#, c-format
msgid "Fix formal inode number in inode #%llu (0x%llx)? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:1211
+#: gfs2/fsck/pass1.c:1213
#, c-format
msgid "Inode number in inode at block #%lld (0x%llx) not fixed\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1235
+#: gfs2/fsck/pass1.c:1237
#, c-format
msgid "Checking system inode '%s'\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1240
+#: gfs2/fsck/pass1.c:1242
#, c-format
msgid "System inode for '%s' is located at block %llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1245
+#: gfs2/fsck/pass1.c:1247
#, c-format
msgid "Found invalid system dinode at block #%llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1261
+#: gfs2/fsck/pass1.c:1263
msgid "The inode exists but the block is not marked 'in use'; fixing it.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1271
+#: gfs2/fsck/pass1.c:1273
#, c-format
msgid "System inode for '%s' is corrupt or missing.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1278
+#: gfs2/fsck/pass1.c:1280
#, c-format
msgid "Invalid or missing %s system inode (should be %d, is %d).\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1280
+#: gfs2/fsck/pass1.c:1282
#, c-format
msgid "Create new %s system inode? (y/n) "
msgstr ""
-#: gfs2/fsck/pass1.c:1281
+#: gfs2/fsck/pass1.c:1283
#, c-format
msgid "Rebuilding system file \"%s\"\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1285
+#: gfs2/fsck/pass1.c:1287
#, c-format
msgid "Error trying to rebuild system file %s: Cannot continue\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1297
+#: gfs2/fsck/pass1.c:1299
#, c-format
msgid "Cannot continue without valid %s inode\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1315
+#: gfs2/fsck/pass1.c:1317
#, c-format
msgid "Error found in %s while checking directory entries.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1334
+#: gfs2/fsck/pass1.c:1336
#, c-format
msgid "Error %d building journal\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1410
+#: gfs2/fsck/pass1.c:1412
msgid "gfs1 statfs inode"
msgstr ""
-#: gfs2/fsck/pass1.c:1412
+#: gfs2/fsck/pass1.c:1414
msgid "gfs1 jindex inode"
msgstr ""
-#: gfs2/fsck/pass1.c:1414
+#: gfs2/fsck/pass1.c:1416
msgid "gfs1 rindex inode"
msgstr ""
-#: gfs2/fsck/pass1.c:1416
+#: gfs2/fsck/pass1.c:1418
msgid "gfs1 quota inode"
msgstr ""
-#: gfs2/fsck/pass1.c:1451
+#: gfs2/fsck/pass1.c:1457
#, c-format
msgid "Skipping rindex indir block %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1464
+#: gfs2/fsck/pass1.c:1470
#, c-format
msgid "Skipping pass 1 is not a good idea.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1469
+#: gfs2/fsck/pass1.c:1475
#, c-format
msgid "Already processed system inode %lld (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1496
+#: gfs2/fsck/pass1.c:1502
#, c-format
msgid ""
"Found a duplicate inode block at #%llu (0x%llx) previously marked as a %s\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1506
+#: gfs2/fsck/pass1.c:1512
msgid "dinum.no_addr is wrong, so I assume the bitmap is just wrong.\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1524
+#: gfs2/fsck/pass1.c:1530
#, c-format
msgid "Deferring GFS1 metadata block #%<PRIu64> (0x%<PRIx64>)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1533
+#: gfs2/fsck/pass1.c:1539
#, c-format
msgid "Found invalid inode at block #%llu (0x%llx)\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1632
+#: gfs2/fsck/pass1.c:1638
#, c-format
msgid "Checking metadata in Resource Group #%llu\n"
msgstr ""
-#: gfs2/fsck/pass1.c:1636
+#: gfs2/fsck/pass1.c:1642
#, c-format
msgid "rgrp block %lld (0x%llx) is now marked as 'rgrp data'\n"
msgstr ""
9 years, 8 months
gfs2-utils: RHEL7 - gfs2-utils: Remove target.mk files
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=1e196553...
Commit: 1e196553a23a60f151ec661291b442bd14952030
Parent: a5eb2a5a1c447a44d993d63f5fe444dc0a9631d4
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 5 12:17:27 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Fri Sep 5 14:57:46 2014 +0100
gfs2-utils: Remove target.mk files
Remove some leftover files from an experimental build system which was
not adopted.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/convert/target.mk | 2 --
gfs2/edit/target.mk | 3 ---
gfs2/fsck/target.mk | 3 ---
gfs2/libgfs2/target.mk | 3 ---
gfs2/man/target.mk | 2 --
gfs2/mkfs/target.mk | 3 ---
gfs2/tune/target.mk | 3 ---
7 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/gfs2/convert/target.mk b/gfs2/convert/target.mk
deleted file mode 100644
index 7beba3c..0000000
--- a/gfs2/convert/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-$(eval $(call make-trans-binary,/usr/sbin/gfs2_convert,gfs2/libgfs2/libgfs2.a))
diff --git a/gfs2/edit/target.mk b/gfs2/edit/target.mk
deleted file mode 100644
index 40e73c9..0000000
--- a/gfs2/edit/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-$(eval $(call make-trans-binary,/usr/sbin/gfs2_edit,gfs2/libgfs2/libgfs2.a -lncurses))
-
diff --git a/gfs2/fsck/target.mk b/gfs2/fsck/target.mk
deleted file mode 100644
index 64e68e2..0000000
--- a/gfs2/fsck/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-$(eval $(call make-trans-binary,/sbin/fsck.gfs2,gfs2/libgfs2/libgfs2.a))
-
diff --git a/gfs2/libgfs2/target.mk b/gfs2/libgfs2/target.mk
deleted file mode 100644
index cc3d506..0000000
--- a/gfs2/libgfs2/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-$(eval $(call make-library,libgfs2.a))
-
diff --git a/gfs2/man/target.mk b/gfs2/man/target.mk
deleted file mode 100644
index 0b6e3b0..0000000
--- a/gfs2/man/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-manpages += *.[0-9]
diff --git a/gfs2/mkfs/target.mk b/gfs2/mkfs/target.mk
deleted file mode 100644
index 7f586c7..0000000
--- a/gfs2/mkfs/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-$(eval $(call make-trans-binary,/sbin/mkfs.gfs2,gfs2/libgfs2/libgfs2.a))
-
diff --git a/gfs2/tune/target.mk b/gfs2/tune/target.mk
deleted file mode 100644
index 62460e4..0000000
--- a/gfs2/tune/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-
-$(eval $(call make-trans-binary,/sbin/tunegfs2,))
-
9 years, 8 months
gfs2-utils: RHEL7 - gfs2l: Fix uninitialised string warning
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=a5eb2a5a...
Commit: a5eb2a5a1c447a44d993d63f5fe444dc0a9631d4
Parent: d49a391965d479c226dfc01efad09e2d96928b92
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 5 10:26:37 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Fri Sep 5 14:57:46 2014 +0100
gfs2l: Fix uninitialised string warning
Initialise c to NULL to fix:
lang.c:142:34: warning: 'c' may be used uninitialized in this function
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/lang.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c
index a9197cb..b4a743f 100644
--- a/gfs2/libgfs2/lang.c
+++ b/gfs2/libgfs2/lang.c
@@ -150,7 +150,7 @@ static void ast_string_unescape(char *str)
static uint64_t ast_lookup_path(char *path, struct gfs2_sbd *sbd)
{
int err = 0;
- char *c;
+ char *c = NULL;
struct gfs2_inode *ip, *iptmp;
char *segment;
uint64_t bn = 0;
9 years, 8 months
gfs2-utils: RHEL7 - mkfs.gfs2: Don't search the bitmaps to allocate journals
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=d49a3919...
Commit: d49a391965d479c226dfc01efad09e2d96928b92
Parent: 4b8cdf7bcb1048090b458ad84d678847bd59bc7f
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Sep 5 09:56:44 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Fri Sep 5 14:57:46 2014 +0100
mkfs.gfs2: Don't search the bitmaps to allocate journals
In mkfs.gfs2 we know the space for the journals is going to be free so
we can skip the free extent search when allocating journal blocks.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/libgfs2/fs_ops.c | 14 +++++++++-----
gfs2/libgfs2/rgrp.c | 2 +-
gfs2/libgfs2/rgrp.h | 1 +
gfs2/mkfs/main_mkfs.c | 2 ++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c
index 9c9cc82..b84b7f4 100644
--- a/gfs2/libgfs2/fs_ops.c
+++ b/gfs2/libgfs2/fs_ops.c
@@ -296,7 +296,9 @@ uint64_t lgfs2_space_for_data(const struct gfs2_sbd *sdp, const unsigned bsize,
* Allocate an extent for a file in a resource group's bitmaps.
* rg: The resource group in which to allocate the extent
* di_size: The size of the file in bytes
- * ip: A pointer to the inode structure, whose fields will be set appropriately
+ * ip: A pointer to the inode structure, whose fields will be set appropriately.
+ * If ip->i_di.di_num.no_addr is not 0, the extent search will be skipped and
+ * the file allocated from that address.
* flags: GFS2_DIF_* flags
* mode: File mode flags, see creat(2)
* Returns 0 on success with the contents of ip set accordingly, or non-zero
@@ -310,11 +312,13 @@ int lgfs2_file_alloc(lgfs2_rgrp_t rg, uint64_t di_size, struct gfs2_inode *ip, u
struct gfs2_sbd *sdp = rg->rgrps->sdp;
struct lgfs2_rbm rbm = { .rgd = rg, .offset = 0, .bii = 0 };
uint32_t blocks = lgfs2_space_for_data(sdp, sdp->bsize, di_size);
- int err;
- err = lgfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &blocks);
- if (err != 0)
- return err;
+ if (ip->i_di.di_num.no_addr != 0) {
+ if (lgfs2_rbm_from_block(&rbm, ip->i_di.di_num.no_addr) != 0)
+ return 1;
+ } else if (lgfs2_rbm_find(&rbm, GFS2_BLKST_FREE, &blocks) != 0) {
+ return 1;
+ }
extlen = lgfs2_alloc_extent(&rbm, GFS2_BLKST_DINODE, blocks);
if (extlen < blocks) {
diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c
index f57ae3a..0d0f000 100644
--- a/gfs2/libgfs2/rgrp.c
+++ b/gfs2/libgfs2/rgrp.c
@@ -643,7 +643,7 @@ lgfs2_rgrp_t lgfs2_rgrp_last(lgfs2_rgrps_t rgs)
*
* Returns: 0 on success, or non-zero with errno set
*/
-static int lgfs2_rbm_from_block(struct lgfs2_rbm *rbm, uint64_t block)
+int lgfs2_rbm_from_block(struct lgfs2_rbm *rbm, uint64_t block)
{
uint64_t rblock = block - rbm->rgd->ri.ri_data0;
struct gfs2_sbd *sdp = rbm_bi(rbm)->bi_bh->sdp;
diff --git a/gfs2/libgfs2/rgrp.h b/gfs2/libgfs2/rgrp.h
index bd89289..fd442b1 100644
--- a/gfs2/libgfs2/rgrp.h
+++ b/gfs2/libgfs2/rgrp.h
@@ -44,6 +44,7 @@ static inline int lgfs2_rbm_eq(const struct lgfs2_rbm *rbm1, const struct lgfs2_
(rbm1->offset == rbm2->offset);
}
+extern int lgfs2_rbm_from_block(struct lgfs2_rbm *rbm, uint64_t block);
extern int lgfs2_rbm_find(struct lgfs2_rbm *rbm, uint8_t state, uint32_t *minext);
extern unsigned lgfs2_alloc_extent(const struct lgfs2_rbm *rbm, int state, const unsigned elen);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 530383d..e927d82 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -694,6 +694,8 @@ static int place_journals(struct gfs2_sbd *sdp, lgfs2_rgrps_t rgs, struct mkfs_o
perror(_("Failed to allocate space for bitmap buffer"));
return result;
}
+ /* Allocate at the beginning of the rgrp, bypassing extent search */
+ in.i_di.di_num.no_addr = lgfs2_rgrp_index(rg)->ri_data0;
/* In order to keep writes sequential here, we have to allocate
the journal, then write the rgrp header (which is now in its
final form) and then write the journal out */
9 years, 8 months