From owner-freebsd-current@FreeBSD.ORG Sun Nov 8 00:02:40 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA513106566B for ; Sun, 8 Nov 2009 00:02:40 +0000 (UTC) (envelope-from a_best01@uni-muenster.de) Received: from zivm-exrelay1.uni-muenster.de (ZIVM-EXRELAY1.UNI-MUENSTER.DE [128.176.192.14]) by mx1.freebsd.org (Postfix) with ESMTP id 394CE8FC17 for ; Sun, 8 Nov 2009 00:02:39 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.44,701,1249250400"; d="txt'?scan'208";a="287660638" Received: from zivmaildisp1.uni-muenster.de (HELO ZIVMAILUSER01.UNI-MUENSTER.DE) ([128.176.188.85]) by zivm-relay1.uni-muenster.de with ESMTP; 08 Nov 2009 01:02:19 +0100 Received: by ZIVMAILUSER01.UNI-MUENSTER.DE (Postfix, from userid 149459) id DE02A1B0766; Sun, 8 Nov 2009 01:02:18 +0100 (CET) Date: Sun, 08 Nov 2009 01:02:06 +0100 (CET) From: Alexander Best Sender: Organization: Westfaelische Wilhelms-Universitaet Muenster To: Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary=+permail-20091108000206f0889e8400007fe2-a_best01+ Cc: Subject: [patch] prevent burncd from failing when device is busy while trying to eject X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 00:02:40 -0000 This is a MIME encoded multipart message. --+permail-20091108000206f0889e8400007fe2-a_best01+ Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit this patch was submitted by Jaakko Heinonen in january, but didn't get committed to HEAD yet. when burncd is used in combination with the eject switch it doesn't care if the device is busy or not. if eject doesn't succeed burncd fails with EIO. the patch issues ATAPI_TEST_UNIT_READY by calling (ioctl(fd, CDIOCRESET). this gets repeated as long as the device isn't busy anymore or a timeout is being reached. this patch depends upon the removal of a bogus privilege check in sys/dev/ata/ata-cd.c would be nice if somebody could commit both patches. they've been tested for almost a year now and cause no breakage to occur. they can also safely be merged to 8-stable. in order to make it into 7- and 6-stable this other patch (bin/95979) has to be mfc'ed to those branches first. thanks in advance. alex --+permail-20091108000206f0889e8400007fe2-a_best01+ Content-Type: text/plain Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="burncd.c.patch.txt" SW5kZXg6IHVzci5zYmluL2J1cm5jZC9idXJuY2QuYwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1c3Iuc2Jpbi9i dXJuY2QvYnVybmNkLmMJKHJldmlzaW9uIDE5OTAxNikKKysrIHVzci5zYmluL2J1cm5jZC9idXJu Y2QuYwkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsNyBAQAogdm9pZCBkb19EQU8oaW50IGZk LCBpbnQsIGludCk7CiB2b2lkIGRvX1RBTyhpbnQgZmQsIGludCwgaW50LCBpbnQpOwogdm9pZCBk b19mb3JtYXQoaW50LCBpbnQsIGNoYXIgKik7Cit2b2lkIHdhaXRfZm9yX3JlYWR5KGludCk7CiBp bnQgd3JpdGVfZmlsZShpbnQgZmQsIHN0cnVjdCB0cmFja19pbmZvICopOwogaW50IHJvdW5kdXBf YmxvY2tzKHN0cnVjdCB0cmFja19pbmZvICopOwogdm9pZCBjdWVfZW50KHN0cnVjdCBjZHJfY3Vl X2VudHJ5ICosIGludCwgaW50LCBpbnQsIGludCwgaW50LCBpbnQsIGludCk7CkBAIC0yMTksNiAr MjIwLDggQEAKIAkJCQkJYnJlYWs7CiAJCQkJbGFzdCA9IHBjdDsKIAkJCX0KKwkJCXdhaXRfZm9y X3JlYWR5KGZkKTsKKwogCQkJaWYgKCFxdWlldCkKIAkJCQlwcmludGYoIlxuIik7CiAJCQljb250 aW51ZTsKQEAgLTMyMiw2ICszMjUsNyBAQAogCQllcnJfc2V0X2V4aXQoTlVMTCk7CiAJCWVycihF WF9JT0VSUiwgImlvY3RsKENEUklPQ1NFVEJMT0NLU0laRSkiKTsKIAl9CisJd2FpdF9mb3JfcmVh ZHkoZmQpOwogCiAJaWYgKGVqZWN0KQogCQlpZiAoaW9jdGwoZmQsIENESU9DRUpFQ1QpIDwgMCkK QEAgLTYwMCw2ICs2MDQsMjcgQEAKIAkJZnByaW50ZihzdGRlcnIsICJcbiIpOwogfQogCit2b2lk Cit3YWl0X2Zvcl9yZWFkeShpbnQgZmQpCit7CisJaW50IHRpbWVvdXQgPSAxMCAqIDEwMDA7CisK Kwl3aGlsZSAodGltZW91dCA+IDApIHsKKwkJLyoKKwkJICogQ0RJT0NSRVNFVCBpc3N1ZXMgQVRB UElfVEVTVF9VTklUX1JFQURZIGNvbW1hbmQuCisJCSAqLworCQlpZiAoaW9jdGwoZmQsIENESU9D UkVTRVQpID09IDApCisJCQlyZXR1cm47CisJCWVsc2UgaWYgKGVycm5vICE9IEVCVVNZKQorCQkJ ZXJyKEVYX0lPRVJSLCAiaW9jdGwoQ0RJT0NSRVNFVCkiKTsKKworCQl1c2xlZXAoNTAwICogMTAw MCk7CisJCXRpbWVvdXQgLT0gNTAwOworCX0KKworICAgICAgICBlcnJ4KEVYX0lPRVJSLCAidGlt ZWQgb3V0IHdoaWxlIHdhaXRpbmcgZm9yIHRoZSBkcml2ZSB0byBiZWNvbWUgcmVhZHkiKTsKK30K KwogaW50CiB3cml0ZV9maWxlKGludCBmZCwgc3RydWN0IHRyYWNrX2luZm8gKnRyYWNrX2luZm8p CiB7Cg== --+permail-20091108000206f0889e8400007fe2-a_best01+ Content-Type: text/plain Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="atapicd.c.patch.txt" SW5kZXg6IHN5cy9kZXYvYXRhL2F0YXBpLWNkLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Rldi9hdGEv YXRhcGktY2QuYwkocmV2aXNpb24gMTk5MDE2KQorKysgc3lzL2Rldi9hdGEvYXRhcGktY2QuYwko d29ya2luZyBjb3B5KQpAQCAtMjU2LDEzICsyNTYsNyBAQAogCWNkcC0+ZmxhZ3MgfD0gRl9MT0NL RUQ7CiAJYnJlYWs7CiAKLSAgICAvKgotICAgICAqIFhYWFJXOiBXaHkgZG9lcyB0aGlzIHJlcXVp cmUgcHJpdmlsZWdlPwotICAgICAqLwogICAgIGNhc2UgQ0RJT0NSRVNFVDoKLQllcnJvciA9IHBy aXZfY2hlY2sodGQsIFBSSVZfRFJJVkVSKTsKLQlpZiAoZXJyb3IpCi0JICAgIGJyZWFrOwogCWVy cm9yID0gYWNkX3Rlc3RfcmVhZHkoZGV2KTsKIAlicmVhazsKIAo= --+permail-20091108000206f0889e8400007fe2-a_best01+--