X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fobdcontrol;h=295a7d11f4e834b5bcb5d28a41b63716961646f0;hb=8c1e3ed09d09830bb6628d4e9b6f8ed37b4ec338;hp=7486cc82e30356452b411c0784cceed33bfce7dd;hpb=fe852b97e1d80516a45d67b89108bf4cac87672a;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/obdcontrol b/lustre/obdclass/obdcontrol index 7486cc8..295a7d1 100755 --- a/lustre/obdclass/obdcontrol +++ b/lustre/obdclass/obdcontrol @@ -73,13 +73,14 @@ eval 'sub OBD_SNAP_RESTORE() { &_IOC(3, ord(\'f\'), 43, 4);}' unless eval 'sub OBD_EXT2_RUNIT () { &_IOC(3, ord(\'f\'), 61, 4);}' unless defined(&OBD_EXT2_RUNIT); -eval 'sub ATTR_MODE () {1;}' unless defined(&ATTR_MODE); -eval 'sub ATTR_UID () {2;}' unless defined(&ATTR_UID); -eval 'sub ATTR_GID () {4;}' unless defined(&ATTR_GID); -eval 'sub ATTR_SIZE () {8;}' unless defined(&ATTR_SIZE); -eval 'sub ATTR_ATIME () {16;}' unless defined(&ATTR_ATIME); -eval 'sub ATTR_MTIME () {32;}' unless defined(&ATTR_MTIME); -eval 'sub ATTR_CTIME () {64;}' unless defined(&ATTR_CTIME); +eval 'sub OBD_MD_FLALL () {~0;}' unless defined(&OBD_MD_FLALL); +eval 'sub OBD_MD_FLATIME () {1<<1;}' unless defined(&OBD_MD_FLATIME); +eval 'sub OBD_MD_FLMTIME () {1<<2;}' unless defined(&OBD_MD_FLMTIME); +eval 'sub OBD_MD_FLCTIME () {1<<3;}' unless defined(&OBD_MD_FLCTIME); +eval 'sub OBD_MD_FLSIZE () {1<<4;}' unless defined(&OBD_MD_FLSIZE); +eval 'sub OBD_MD_FLMODE () {1<<7;}' unless defined(&OBD_MD_FLMODE); +eval 'sub OBD_MD_FLUID () {1<<8;}' unless defined(&OBD_MD_FLUID); +eval 'sub OBD_MD_FLGID () {1<<9;}' unless defined(&OBD_MD_FLGID); use Getopt::Long; use File::stat; @@ -89,6 +90,112 @@ use Term::ReadLine; use IO::Handle; +# NOTE long long are layed out in ia32 memory as follows: +# u = 0xaaaabbbbccccdddd has ccccdddd at &u and aaaabbbb 4 bytes on +# this may be different on other architectures + +# we use 32-bit integers for all 64-bit quantities in this program +# #define OBD_INLINESZ 60 +# #define OBD_OBDMDSZ 60 +# /* Note: 64-bit types are 64-bit aligned in structure */ +# struct obdo { +# obd_id o_id; +# obd_gr o_gr; +# obd_time o_atime; +# obd_time o_mtime; +# obd_time o_ctime; +# obd_size o_size; +# obd_blocks o_blocks; +# obd_blksize o_blksize; +# obd_mode o_mode; +# obd_uid o_uid; +# obd_gid o_gid; +# obd_flag o_flags; +# obd_flag o_obdflags; +# obd_count o_nlink; +# obd_count o_generation; +# obd_flag o_valid; /* hot fields in this obdo */ +# char o_inline[60]; +# char o_obdmd[60]; +# struct list_head o_list; +# struct obd_ops *o_op; +# }; + +sub obdo_pack { + my $obdo = shift; + pack "LL LL LL LL LL LL LL L L L L L L L L L a60 a60 L L L", + $obdo->{id}, 0, + $obdo->{gr}, 0, + $obdo->{atime}, 0, + $obdo->{mtime}, 0 , + $obdo->{ctime}, 0, + $obdo->{size}, 0, + $obdo->{blocks}, 0, + $obdo->{blksize}, + $obdo->{mode}, + $obdo->{uid}, + $obdo->{gid}, + $obdo->{flags}, + $obdo->{obdflags}, + $obdo->{nlink}, + $obdo->{generation}, + $obdo->{valid}, + $obdo->{inline}, + $obdo->{obdmd}, + 0, 0, # struct list_head + 0; # struct obd_ops +} + +sub obdo_unpack { + my $buf = shift; + my $offset = shift; + my $obdo; + ($obdo->{id}, + $obdo->{gr}, + $obdo->{atime}, + $obdo->{mtime}, + $obdo->{ctime}, + $obdo->{size}, + $obdo->{blocks}, + $obdo->{blksize}, + $obdo->{mode}, + $obdo->{uid}, + $obdo->{gid}, + $obdo->{flags}, + $obdo->{obdflags}, + $obdo->{nlink}, + $obdo->{generation}, + $obdo->{valid}, + $obdo->{inline}, + $obdo->{obdmd}) = unpack "x${offset}Lx4 Lx4 Lx4 Lx4 Lx4 Lx4 Lx4 L L L L L L L L L a60 a60", $buf; + $obdo; +} + +sub obdo_print { + + my $obdo = shift; + + printf "id: %d\ngrp: %d\natime: %s\nmtime: %s\nctime: %s\nsize: %d\nblocks: %d\nblksize: %d\nmode: %o\nuid: %d\ngid: %d\nflags: %x\nobdflags: %x\nnlink: %d\nvalid: %x\ninline: %s\nobdmd: %s\n", + $obdo->{id}, + $obdo->{gr}, + $obdo->{atime}, + $obdo->{mtime}, + $obdo->{ctime}, + $obdo->{size}, + $obdo->{blocks}, + $obdo->{blksize}, + $obdo->{mode}, + $obdo->{uid}, + $obdo->{gid}, + $obdo->{flags}, + $obdo->{obdflags}, + $obdo->{nlink}, + $obdo->{valid}, + $obdo->{inline}, + $obdo->{obdmd}; +} + + my ($file); GetOptions("f!" => \$file, "device=s" => \$::device, ) || die "Getoptions"; @@ -102,9 +209,9 @@ my $arg; my %commands = ('device' => {func => "Device", doc => "device : open another OBD device"}, - 'create' => {func => "Create", doc => "create: creates a new inode"}, - 'attach' => {func => "Attach", doc => "attach { ext2_obd | snap_obd snapdev snapidx tableno | scsi_obd adapter bus tid lun" }, - 'detach' => {func => "Detach", doc => "detach this device"}, + 'create' => {func => "Create", doc => "create [ [ [quiet]]]: create new object(s) (files, unless mode is given)"}, + 'attach' => {func => "Attach", doc => "attach { ext2_obd | snap_obd snapdev snapidx tableno | scsi_obd adapter bus tid lun }: attach this minor device to the specified driver" }, + 'detach' => {func => "Detach", doc => "detach this minor device"}, 'testext2iterator' => {func => "TestExt2Iterator", doc => "test ext2 iterator function"}, 'snapset' => {func => "SnapSetTable", doc => "snapset : set the table (created with snaptable) as table #tableno" }, 'snapprint' => {func => "SnapPrint", doc => "snapprint : output the contents of table #tableno to the syslog"}, @@ -113,21 +220,21 @@ my %commands = 'snaptable' => {func => "SnapShotTable", doc => "snaptable: build a snapshot table (interactive)"}, 'copy' => {func => "Copy", doc => "copy : copy objects"}, 'migrate' => {func => "Migrate", doc => "migrate : migrate data from one object to another"}, - 'format' => {func => "Format", doc => "format type adapter bus tid lun size"}, - 'partition' => {func => "Partition", doc => "partition type adapter bus tid lun partition size"}, + 'partition' => {func => "Partition", doc => "partition : create a partition"}, + 'format' => {func => "Format", doc => "format : format a partition"}, 'setup' => {func => "Setup", doc => "setup [type]: link this OBD device to the underlying device (default type ext2_obd)"}, 'connect' => {func => "Connect", doc => "connect: allocates client ID for this session"}, 'disconnect' => {func => "Disconnect", doc => "disconnect [id]: frees client resources"}, 'sync' => {func => "Sync", doc => "sync: flushes buffers to disk"}, - 'destroy' => {func => "Destroy", doc => "destroy : destroys an inode"}, + 'destroy' => {func => "Destroy", doc => "destroy : destroys an object"}, 'cleanup' => {func => "Cleanup", doc => "cleanup the minor obd device"}, 'dec_use_count' => {func => "Decusecount", doc => "decreases the module use count so that the module can be removed following an oops"}, - 'read' => {func => "Read", doc => "read [offset]"}, - 'fsread' => {func => "Read2", doc => "read [offset]"}, - 'write' => {func => "Write", doc => "write "}, - 'setattr' => {func => "Setattr", doc => "setattr [mode [uid [gid [size [atime [mtime [ctime]]]]]]]"}, - 'getattr' => {func => "Getattr", doc => "getattr : displays inode object attributes"}, - 'preallocate' => {func => "Preallocate", doc => "preallocate [num]: requests preallocation of num inodes."}, + 'read' => {func => "Read", doc => "read [offset]: read data from object"}, + 'fsread' => {func => "Read2", doc => "read [offset]: read data from object"}, + 'write' => {func => "Write", doc => "write : write data to object"}, + 'setattr' => {func => "Setattr", doc => "setattr [mode [uid [gid [size [atime [mtime [ctime]]]]]]]: sets object attributes"}, + 'getattr' => {func => "Getattr", doc => "getattr : displays object attributes"}, + 'preallocate' => {func => "Preallocate", doc => "preallocate [num]: requests preallocation of num objects."}, 'statfs' => {func => "Statfs", doc => "statfs: filesystem status information"}, 'help' => {func => \&Help, doc => "help: this message"}, 'quit' => {func => \&Quit, doc => "see \"exit\""}, @@ -210,8 +317,8 @@ sub process_line { sub execute_line { my $line = shift; - my @arg = split(' ', $line); - my $word = shift @arg; + my @cmdline = split(' ', $line); + my $word = shift @cmdline; my $cmd; if ( $file ) { @@ -225,11 +332,11 @@ sub execute_line { } if ($cmd eq "help" || $cmd eq "exit" || $cmd eq "quit") { - return (&{$commands{$cmd}->{func}}(@arg)); + return (&{$commands{$cmd}->{func}}(@cmdline)); } # Call the function. - return (&{$commands{$cmd}->{func}}(@arg)); + return (&{$commands{$cmd}->{func}}(@cmdline)); } @@ -251,7 +358,6 @@ sub Device { } - sub Attach { my $err = 0; my $type = shift; @@ -281,7 +387,8 @@ usage: $data = pack("iii", $snapdev, $snapidx, $tableno); $datalen = 3 * 4; } elsif ($type eq "ext2_obd") { - 1; + $data = pack("i", 4711); # bogus data + $datalen = 0; } else { print "error: unknown attach type $type\n"; goto usage; @@ -304,6 +411,7 @@ usage: } } + sub Detach { my $err = 0; my $data = ""; @@ -333,7 +441,6 @@ sub TestExt2Iterator { my $len = length($type); my $cl = length($data); - my $add = pack("p", $data); print "type $type (len $len), datalen $datalen ($cl)\n"; my $packed = pack("Lipip", $::client_id, length($type), $type, $datalen, $data); @@ -363,7 +470,6 @@ sub SnapDelete { my $len = length($type); my $cl = length($data); - my $add = pack("p", $data); print "type $type (len $len), datalen $datalen ($cl)\n"; my $packed = pack("Lipip", $::client_id, length($type), $type, $datalen, $data); @@ -483,7 +589,6 @@ sub SnapPrint { my $len = length($type); my $cl = length($data); - my $add = pack("p", $data); print "type $type (len $len), datalen $datalen ($cl)\n"; my $packed = pack("Lipip", $::client_id, length($type), $type, $datalen, $data); @@ -524,13 +629,13 @@ sub SnapSetTable { $data = pack("ii", $snaptableno, $snapcount); $datalen = 2 * 4; foreach my $time (sort keys %{$table}) { + # XXX we should change to pack LL instead of I for times $data .= pack("Ii", $time, $table->{$time}); $datalen += 8; } my $len = length($type); my $cl = length($data); - my $add = pack("p", $data); print "type $type (len $len), datalen $datalen ($cl)\n"; my $packed = pack("Lipip", $::client_id, length($type), $type, $datalen, $data); @@ -647,12 +752,18 @@ sub WriteSnapShotTable { sub Copy { my $err = 0; - my $srcid = shift; - my $tgtid = shift; - my $data = pack("III", $::client_id, $srcid, $tgtid); - my $datalen = 12; + my $src_obdo; + my $dst_obdo; + + # Note: _copy IOCTL takes parameters as dst, src. + # Copy function takes parameters as src, dst. + $src_obdo->{id} = shift; + $dst_obdo->{id} = shift; + $src_obdo->{valid} = &OBD_MD_FLALL; + + # XXX need to fix copy so we can have 2 client IDs here + my $packed = pack("L", $::client_id) . obdo_pack($dst_obdo) . pack("L", $::client_id) . obdo_pack($src_obdo); - my $packed = pack("ip", $datalen, $data); my $rc = ioctl(DEV_OBD, &OBD_IOC_COPY, $packed); if (!defined $rc) { @@ -666,12 +777,16 @@ sub Copy { sub Migrate { my $err = 0; - my $srcid = shift; - my $tgtid = shift; - my $data = pack("III", $::client_id, $srcid, $tgtid); - my $datalen = 12; - my $packed = pack("ip", $datalen, $data); + # Note: _migr IOCTL takes parameters as dst, src. + # Migrate function takes parameters as src, dst. + $src_obdo->{id} = shift; + $dst_obdo->{id} = shift; + $src_obdo->{valid} = &OBD_MD_FLALL; + + # We pack a dummy connection ID here + my $packed = pack("L", $::client_id) . obdo_pack($dst_obdo) . pack("L", $::client_id) . obdo_pack($src_obdo); + my $rc = ioctl(DEV_OBD, &OBD_IOC_MIGR, $packed); if (!defined $rc) { @@ -730,8 +845,8 @@ sub Setup { # XXX we need a getinfo ioctl to validate parameters # by type here - if ($arg && !defined($::st = stat($arg))) { - print "$arg is not a valid device\n"; + if ($arg && !defined($::st = stat($arg))) { + print "$dev is not a valid device\n"; return; } @@ -814,38 +929,52 @@ sub Disconnect { } sub Create { - my $arg = shift; + if (!defined($::client_id)) { + print "You must first ``connect''.\n"; + return; + } + + my $num = shift; + my $mode = shift; my $quiet = shift; my $rc; my $prealloc = 0; - if (defined($quiet) && $quiet ne "quiet") { - print "syntax: create [number of objects [quiet]]\n"; + if (!defined($num)) { + $num = 1; + } + + if (!defined($mode)) { + $mode = 0100644; # create a file (rw-r--r--) if not specified + } + + if (scalar($num) < 1 || defined($quiet) && $quiet ne "quiet") { + print "usage: create [ [ [quiet]]]\n"; return; } - my $packed = pack("IL", $::client_id, $prealloc); - if (!defined($arg) || scalar($arg) < 2) { - print "Creating 1 object...\n"; - $rc = ioctl(DEV_OBD, &OBD_IOC_CREATE, $packed); - if (!defined($quiet)) { - my $ino = unpack("L", $packed); - print "Created object #$ino.\n"; - } - } else { - my $i; + my $i; + my $id = 0; # can't currently request IDs + + print "Creating " . scalar($num) . " object"; + if (scalar($num) > 1) { + print "s"; + } + print "\n"; + + for ($i = 0; $i < scalar($num); $i++) { + my $obdo; + $obdo->{id} = $id; + $obdo->{mode} = scalar($mode); + $obdo->{valid} = &OBD_MD_FLMODE; - print "Creating " . scalar($arg) . " objects...\n"; - for ($i = 0; $i < scalar($arg); $i++) { - $rc = ioctl(DEV_OBD, &OBD_IOC_CREATE, $packed); - my $ino = unpack("L", $packed); - if ($rc ne "0 but true") { - last; - $packed = pack("IL", $::client_id, $prealloc); - } elsif (!defined($quiet)) { - $packed = pack("IL", $::client_id, $prealloc); - print "Created object #$ino.\n"; - } + my $packed = pack("I", $::client_id) . obdo_pack($obdo); + $rc = ioctl(DEV_OBD, &OBD_IOC_CREATE, $packed); + if ($rc ne "0 but true") { + last; + } elsif (!defined($quiet)) { + $obdo = obdo_unpack($packed, 4); + print "Created object #$obdo->{id}.\n"; } } @@ -877,15 +1006,15 @@ sub Destroy { return; } - my $arg = shift; + my $id = shift; - if (!defined($arg) || scalar($arg) < 1) { - print "destroy requires the object number to destroy.\n"; + if (!defined($id) || scalar($id) < 1) { + print "usage: destroy \n"; return; } - print "Destroying object $arg...\n"; - my $packed = pack("IL", $::client_id, $arg); + print "Destroying object $id...\n"; + my $packed = pack("IL", $::client_id, $id); my $rc = ioctl(DEV_OBD, &OBD_IOC_DESTROY, $packed); if (!defined $rc) { @@ -903,32 +1032,25 @@ sub Getattr { return; } - my $inode = shift; + my $id = shift; - if (!defined($inode) || scalar($inode) < 1) { + if (!defined($id) || scalar($id) < 1) { print "invalid arguments; type \"help getattr\" for a synopsis\n"; return; } # see Setattr - my $packed = pack("ILsx2lLLLI", $::client_id, $inode, 0, 0, 0, 0, 0, 0, 0, - 0); + my $obdo; + $obdo->{id} = $id; + $obdo->{valid} = &OBD_MD_FLALL; + my $packed = pack("L", $::client_id) . obdo_pack($obdo); my $rc = ioctl(DEV_OBD, &OBD_IOC_GETATTR, $packed); - + if (!defined $rc) { print STDERR "ioctl failed: $!\n"; } elsif ($rc eq "0 but true") { - my ($valid, $mode, $uid, $gid, $size, $atime, $mtime, $ctime, $flags); - ($valid, $mode, $uid, $gid, $size, $atime, $mtime, $ctime, $flags) = - unpack("ISssx2lLLLI", $packed); - - printf("Inode: %d Mode: %o\n", $inode, $mode); - printf("User: %6d Group: %6d Size: %d\n", $uid, $gid, $size); - printf("ctime: %08lx -- %s\n", $ctime, scalar(gmtime($ctime))); - printf("atime: %08lx -- %s\n", $atime, scalar(gmtime($atime))); - printf("mtime: %08lx -- %s\n", $mtime, scalar(gmtime($mtime))); - printf("flags: %08x\n", $flags); - print "Finished (success)\n"; + $obdo = obdo_unpack($packed, 4); + obdo_print($obdo); } else { print "ioctl returned error code $rc.\n"; } @@ -940,59 +1062,49 @@ sub Setattr { return; } - my $inode = shift; - my $valid = 0; - my $mode = oct(shift); - my $uid = shift; - my $gid = shift; - my $size = shift; - my $atime = shift; - my $mtime = shift; - my $ctime = shift; + my $id = shift; - if (defined($uid)) { - $valid |= &ATTR_UID; + if (!defined($id) || scalar($id) < 1) { + print "invalid arguments; type \"help setattr\" for a synopsis\n"; + return; } - if (defined($gid)) { - $valid |= &ATTR_GID; + + # XXX we do not currently set all of the fields in the obdo + my $obdo; + $obdo->{id} = $id; + $obdo->{mode} = oct(shift); + $obdo->{uid} = shift; + $obdo->{gid} = shift; + $obdo->{size} = shift; + $obdo->{atime} = shift; + $obdo->{mtime} = shift; + $obdo->{ctime} = shift; + $obdo->{valid} = 0; + + if (defined($obdo->{atime})) { + $obdo->{valid} |= &OBD_MD_FLATIME; } - if (defined($size)) { - $valid |= &ATTR_SIZE; + if (defined($obdo->{mtime})) { + $obdo->{valid} |= &OBD_MD_FLMTIME; } - if (defined($atime)) { - $valid |= &ATTR_ATIME; + if (defined($obdo->{ctime})) { + $obdo->{valid} |= &OBD_MD_FLCTIME; } - if (defined($mtime)) { - $valid |= &ATTR_MTIME; + if (defined($obdo->{size})) { + $obdo->{valid} |= &OBD_MD_FLSIZE; } - if (defined($ctime)) { - $valid |= &ATTR_CTIME; + if (defined($obdo->{mode})) { + $obdo->{valid} |= &OBD_MD_FLMODE; } - if (defined($mode)) { - $valid |= &ATTR_MODE; + if (defined($obdo->{uid})) { + $obdo->{valid} |= &OBD_MD_FLUID; } - - if (!defined($inode) || scalar($inode) < 1) { - print "invalid arguments; type \"help setattr\" for a synopsis\n"; - return; + if (defined($obdo->{gid})) { + $obdo->{valid} |= &OBD_MD_FLGID; } - #struct iattr { - # unsigned int ia_valid; (32) - # umode_t ia_mode; (16) - # uid_t ia_uid; (16) - # gid_t ia_gid; (16) - # -- 16 bit alignment here! -- - # off_t ia_size; (32) - # time_t ia_atime; (32) - # time_t ia_mtime; (32) - # time_t ia_ctime; (32) - # unsigned int ia_attr_flags; (32) - #}; - - printf "valid is %x, mode is %o\n", $valid, $mode; - my $packed = pack("ILLSssx2ILLLL", $::client_id, $inode, $valid, $mode, - $uid, $gid, $size, $atime, $mtime, $ctime, 0); + printf "valid is %x, mode is %o\n", $obdo->{valid}, $obdo->{mode}; + my $packed = pack("L", $::client_id) . obdo_pack($obdo); my $rc = ioctl(DEV_OBD, &OBD_IOC_SETATTR, $packed); if (!defined $rc) { @@ -1010,11 +1122,11 @@ sub Read { return; } - my $inode = shift; + my $id = shift; my $count = shift; my $offset = shift; - if (!defined($inode) || scalar($inode) < 1 || !defined($count) || + if (!defined($id) || scalar($id) < 1 || !defined($count) || $count < 1 || (defined($offset) && $offset < 0)) { print "invalid arguments; type \"help read\" for a synopsis\n"; return; @@ -1025,14 +1137,18 @@ sub Read { } print("Reading $count bytes starting at byte $offset from object " . - "$inode...\n"); + "$id...\n"); # "allocate" a large enough buffer my $buf = sprintf("%${count}s", " "); die "suck" if (length($buf) != $count); + my $obdo; + $obdo->{id} = $id; + # the perl we're using doesn't support pack type Q, and offset is 64 bits - my $packed = pack("ILpLLL", $::client_id, $inode, $buf, $count, $offset, 0); + my $packed = pack("L", $::client_id) . obdo_pack($obdo) . + pack("p LL LL", $buf, $count, $offset); my $rc = ioctl(DEV_OBD, &OBD_IOC_READ, $packed); @@ -1059,11 +1175,11 @@ sub Read2 { return; } - my $inode = shift; + my $id = shift; my $count = shift; my $offset = shift; - if (!defined($inode) || scalar($inode) < 1 || !defined($count) || + if (!defined($id) || scalar($id) < 1 || !defined($count) || $count < 1 || (defined($offset) && $offset < 0)) { print "invalid arguments; type \"help read\" for a synopsis\n"; return; @@ -1074,14 +1190,18 @@ sub Read2 { } print("Reading $count bytes starting at byte $offset from object " . - "$inode...\n"); + "$id...\n"); # "allocate" a large enough buffer my $buf = sprintf("%${count}s", " "); die "suck" if (length($buf) != $count); + my $obdo; + $obdo->{id} = $id; + # the perl we're using doesn't support pack type Q, and offset is 64 bits - my $packed = pack("ILpLLL", $::client_id, $inode, $buf, $count, $offset, 0); + my $packed = pack("L", $::client_id) . obdo_pack($obdo) . + pack("p LL LL", $buf, $count, $offset); my $rc = ioctl(DEV_OBD, &OBD_IOC_READ2, $packed); @@ -1108,12 +1228,12 @@ sub Write { return; } - my $inode = shift; + my $id = shift; my $offset = shift; my $text = join(' ', @_); my $count = length($text); - if (!defined($inode) || scalar($inode) < 1 || !defined($offset) || + if (!defined($id) || scalar($id) < 1 || !defined($offset) || scalar($offset) < 0) { print "invalid arguments; type \"help write\" for a synopsis\n"; return; @@ -1125,10 +1245,15 @@ sub Write { } print("Writing $count bytes starting at byte $offset to object " . - "$inode...\n"); + "$id...\n"); + + my $obdo; + $obdo->{id} = $id; # the perl we're using doesn't support pack type Q - my $packed = pack("ILpLLL", $::client_id, $inode, $text, $count, $offset, 0); + my $packed = pack("L", $::client_id) . obdo_pack($obdo) . + pack("p LL LL", $buf, $count, $offset); + my $rc = ioctl(DEV_OBD, &OBD_IOC_WRITE, $packed); $retval = unpack("l", $packed); @@ -1148,20 +1273,20 @@ sub Write { } sub Preallocate { - my $arg = shift; + my $num = shift; if (!defined($::client_id)) { print "You must first ``connect''.\n"; return; } - if (!defined($arg) || scalar($arg) < 1 || scalar($arg) > 32) { - $arg = 32; + if (!defined($num) || scalar($num) < 1 || scalar($num) > 32) { + $num = 32; } - print "Preallocating $arg inodes...\n"; - my $packed = pack("LLx128", $::client_id, $arg); - # client id, alloc, inodes[32] + print "Preallocating $num objects...\n"; + # client id, alloc, id[32] + my $packed = pack("LLx128", $::client_id, $num); my $rc = ioctl(DEV_OBD, &OBD_IOC_PREALLOCATE, $packed); @@ -1169,11 +1294,11 @@ sub Preallocate { print STDERR "ioctl failed: $!\n"; } elsif ($rc eq "0 but true") { my $alloc = unpack("x4L", $packed); - my @inodes = unpack("x8L32", $packed); + my @ids = unpack("x8L32", $packed); my $i; - print "Got $alloc inodes: "; - foreach $i (@inodes) { + print "Got $alloc objects: "; + foreach $i (@ids) { print $i . " "; } print "\nFinished (success)\n"; @@ -1234,12 +1359,12 @@ sub Statfs { } sub Help { - my $arg = shift; + my $cmd = shift; - if ( !$arg || !$commands{$arg} ) { + if ( !$cmd || !$commands{$cmd} ) { print "Comands: ", join( ' ', @jcm_cmd_list), "\n"; } else { - print "Usage: " . $commands{$arg}->{doc} . "\n"; + print "Usage: " . $commands{$cmd}->{doc} . "\n"; } }