Over of the changes:

[fs/lustre-release.git] / lustre / obdclass / obdcontrol

diff --git a/lustre/obdclass/obdcontrol b/lustre/obdclass/obdcontrol
index 18d3360..07458c0 100755 (executable)
--- a/lustre/obdclass/obdcontrol
+++ b/lustre/obdclass/obdcontrol
@@ -296,7 +296,7 @@ sub Setup {
 
 sub Cleanup {
     my $err = "0";
 
 sub Cleanup {
     my $err = "0";

-    my $rc = ioctl(DEV_OBD, &OBD_IOC_CLEANUP_OBDDEV, $err);
+    my $rc = ioctl(DEV_OBD, &OBD_IOC_CLEANUP, $err);

 
     if (!defined $rc) {
        print STDERR "ioctl failed: $!\n";
 
     if (!defined $rc) {
        print STDERR "ioctl failed: $!\n";


@@ -380,9 +380,11 @@ sub Create {
        for ($i = 0; $i < scalar($arg); $i++) {
            $rc = ioctl(DEV_OBD, &OBD_IOC_CREATE, $packed);
            my $ino = unpack("L", $packed);
        for ($i = 0; $i < scalar($arg); $i++) {
            $rc = ioctl(DEV_OBD, &OBD_IOC_CREATE, $packed);
            my $ino = unpack("L", $packed);

-           if (!($rc eq "0 but true") || $packed == 0) {
+           if (!($rc eq "0 but true")) {

                last;
                last;

+               $packed = pack("IL", $::client_id, $prealloc);

            } elsif (!defined($quiet)) {
            } elsif (!defined($quiet)) {

+               $packed = pack("IL", $::client_id, $prealloc);

                print "Created object #$ino.\n";
            }
        }
                print "Created object #$ino.\n";
            }
        }