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

When restoring a UFS dump onto a ZFS filesystem, an assertion in

Browse Source 
restore was failing because ZFS was reporting a blocksize that was
not a multiple of 1024.  Replace restore's failed assertion with
code that writes restored files in a blocksize that works for
restore (a multiple of 1024) despite being non-optimal for ZFS.

Submitted by: Dmitry Morozovsky
Tested by:    Dmitry Morozovsky
MFC after:    1 week
This commit is contained in:
Kirk McKusick 2014-07-30 14:52:04 +00:00
parent b38ebc0538
commit 73187559a6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=269303
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/restore/tape.c
View File

@ -260,9 +260,11 @@ setup(void)
fssize = TP_BSIZE;
if (stbuf.st_blksize >= TP_BSIZE && stbuf.st_blksize <= MAXBSIZE)
fssize = stbuf.st_blksize;
if (((fssize - 1) & fssize) != 0) {
fprintf(stderr, "bad block size %ld\n", fssize);
done(1);
if (((TP_BSIZE - 1) & stbuf.st_blksize) != 0) {
fprintf(stderr, "Warning: filesystem with non-multiple-of-%d "
"blocksize (%d);\n", TP_BSIZE, stbuf.st_blksize);
fssize = roundup(fssize, TP_BSIZE);
fprintf(stderr, "\twriting using blocksize %ld\n", fssize);
}
if (spcl.c_volume != 1) {
fprintf(stderr, "Tape is not volume 1 of the dump\n");