From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <3F055705.9040106@altlinux.com> Date: Fri, 04 Jul 2003 14:29:25 +0400 From: Anton Farygin Organization: ALT Linux User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.4) Gecko/20030627 X-Accept-Language: ru-ru, ru MIME-Version: 1.0 To: ALT Linux kernel packages development X-Enigmail-Version: 0.76.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2EFF6C9F5ABF6D53B3A96877" Subject: [d-kernel] =?koi8-r?b?zs/XwdEg18XS08nRINDB1N7BIMTM0SBzZA==?= X-BeenThere: devel-kernel@altlinux.ru X-Mailman-Version: 2.1.1 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2003 10:40:51 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2EFF6C9F5ABF6D53B3A96877 Content-Type: multipart/mixed; boundary="------------070801010608030104060404" This is a multi-part message in MIME format. --------------070801010608030104060404 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 8bit Собственно новая версия патча с исправлением небольшой ошибки. Просьба включить в std ядра. Rgds, Rider --------------070801010608030104060404 Content-Type: text/plain; name="linux-2.4.21-altlinux-scsi-addproc-sd-0.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linux-2.4.21-altlinux-scsi-addproc-sd-0.1.patch" diff -ur kernel-source-2.4.21.orig/drivers/scsi/sd.c kernel-source-2.4.21/drivers/scsi/sd.c --- kernel-source-2.4.21.orig/drivers/scsi/sd.c 2003-06-13 18:51:36 +0400 +++ kernel-source-2.4.21/drivers/scsi/sd.c 2003-07-04 12:22:22 +0400 @@ -1421,8 +1421,45 @@ return; } +#ifdef CONFIG_PROC_FS +static int scsi_proc_hostno(char *page, char **start, off_t off, int count, int *eof, void *data) +{ + Scsi_Disk *dpnt; + Scsi_Device *sdp; + int i, size = 0, len = 0; + char nbuff[6]; + + for (dpnt = rscsi_disks, i=0; i < sd_template.nr_dev; i++, dpnt++) { + if (!dpnt->device) + continue; + sdp = dpnt->device; + sd_devname(i, nbuff); + size = sprintf(page + len, "%s: scsi%02d(%d,%d,%d)\n", nbuff, sdp->host->host_no, sdp->channel, sdp->id, sdp->lun); + len += size; + } + if (len <= off+count) + *eof = 1; + *start = page + off; + len -= off; + if (len > count) + len = count; + if (len < 0) + len = 0; + return (len); +} +#endif + static int __init init_sd(void) { +#ifdef CONFIG_PROC_FS + struct proc_dir_entry *hostno; + + hostno = create_proc_read_entry ("scsi/scsi_sd", 0, NULL, scsi_proc_hostno, NULL); + if (!hostno) { + printk (KERN_ERR "cannot init /proc/scsi/scsi_sd\n"); + return -ENOMEM; + } +#endif sd_template.module = THIS_MODULE; return scsi_register_module(MODULE_SCSI_DEV, &sd_template); } @@ -1457,6 +1494,9 @@ sd_template.dev_max = 0; if (sd_gendisks != NULL) /* kfree tests for 0, but leave explicit */ kfree(sd_gendisks); +#ifdef CONFIG_PROC_FS + remove_proc_entry("scsi/scsi_sd", 0); +#endif } module_init(init_sd); --------------070801010608030104060404-- --------------enig2EFF6C9F5ABF6D53B3A96877 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQE/BVcIqohfd2vlwKsRAq1iAJ44Zv04KWO08GrHODxTyLuXh3SyiQCdEQ+5 r/oSMEjAEmEg2FxFky6RsVc= =77h2 -----END PGP SIGNATURE----- --------------enig2EFF6C9F5ABF6D53B3A96877--