From 07c6c450bed09672b858267a4053089d88fc59af Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sat, 27 Nov 2004 15:08:10 +0000 Subject: [PATCH 1/1] really remove all output from fusermount, define constant BLOCK to 1024 (used in various places) git-svn-id: svn://svn.rot13.org/fuse_dbi/trunk@52 17f4e80c-d0e0-0310-8903-bfc3ae804c12 --- DBI.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/DBI.pm b/DBI.pm index 24d9d8c..3b36596 100755 --- a/DBI.pm +++ b/DBI.pm @@ -12,9 +12,11 @@ use DBI; use Carp; use Data::Dumper; - our $VERSION = '0.07'; +# block size for this filesystem +use constant BLOCK => 1024; + =head1 NAME Fuse::DBI - mount your database as filesystem and use it @@ -247,7 +249,7 @@ sub umount { my $self = shift; if ($self->{'mount'} && $self->is_mounted) { - system "fusermount -u ".$self->{'mount'}." 2>&1 >/dev/null" || + system "( fusermount -u ".$self->{'mount'}." 2>&1 ) >/dev/null" || system "sudo umount ".$self->{'mount'} || return 0; return 1; @@ -369,8 +371,8 @@ sub e_getattr { $file =~ s,^/,,; $file = '.' unless length($file); return -ENOENT() unless exists($files{$file}); - my ($size) = $files{$file}{size} || 1024; - my ($dev, $ino, $rdev, $blocks, $gid, $uid, $nlink, $blksize) = (0,0,0,int(($size+1023)/1024),0,0,1,1024); + my ($size) = $files{$file}{size} || BLOCK; + my ($dev, $ino, $rdev, $blocks, $gid, $uid, $nlink, $blksize) = (0,0,0,int(($size+BLOCK-1)/BLOCK),0,0,1,BLOCK); my ($atime, $ctime, $mtime); $atime = $ctime = $mtime = $files{$file}{ctime} || $ctime_start; @@ -556,9 +558,9 @@ sub e_statfs { print "$inodes: $f [$size]\n"; } - $size = int(($size+1023)/1024); + $size = int(($size+BLOCK-1)/BLOCK); - my @ret = (255, $inodes+1000, $inodes, $size, $size-10, 1024); + my @ret = (255, $inodes, 1, $size, $size-1, BLOCK); print "statfs: ",join(",",@ret),"\n"; -- 2.20.1