d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Protect against specifing journal less than 100MB and against journal

Browse Source 
which size is not multiple of sector size.

  Reported by:	Eric Anderson <anderson@centtech.com>

- Improve wording in error message. I'm sorry, I don't remember who
  submitted this one.
This commit is contained in:
pjd 2007-04-03 15:29:16 +00:00
parent a65de131f1
commit 5ef608fbbe
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sbin/geom/class/journal/geom_journal.c
View File

@ -180,20 +180,29 @@ journal_label(struct gctl_req *req)
case 1:
if (!force && g_journal_fs_exists(data)) {
gctl_error(req, "File system exists on %s and this "
"operation is going to destroy it. Use -f if you "
"operation would destroy it.\nUse -f if you "
"really want to do it.", data);
return;
}
journal = data;
msize = g_get_mediasize(data);
ssize = g_get_sectorsize(data);
if (jsize == -1) {
/*
* No journal size specified. 1GB should be safe
* default.
*/
jsize = 1073741824ULL;
} else {
if (jsize < 104857600) {
gctl_error(req, "Journal too small.");
return;
}
if ((jsize % ssize) != 0) {
gctl_error(req, "Invalid journal size.");
return;
}
}
msize = g_get_mediasize(data);
ssize = g_get_sectorsize(data);
if (jsize + ssize >= msize) {
gctl_error(req, "Provider too small for journalling. "
"You can try smaller jsize (default is %jd).",