rpms/netbsd-iscsi/devel netbsd-iscsi-20080207-allocate.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 netbsd-iscsi.spec, 1.3, 1.4 sources, 1.2, 1.3

Lubomir Rintel lkundrak at fedoraproject.org
Fri Oct 3 22:13:31 UTC 2008


Author: lkundrak

Update of /cvs/pkgs/rpms/netbsd-iscsi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9355

Modified Files:
	.cvsignore netbsd-iscsi.spec sources 
Added Files:
	netbsd-iscsi-20080207-allocate.patch 
Log Message:
* Fri Oct 3 2008 Lubomir Rintel <lkundrak at v3.sk> - 20080207-1
- Update to more recent upstream code
- Remove the silly prealocation code (#465533)


netbsd-iscsi-20080207-allocate.patch:

--- NEW FILE netbsd-iscsi-20080207-allocate.patch ---
Why would anyone rewrite the last block of a file or a block device to `allocate'
space? Seriously -- would this extend the block device; or fill the space in
between instead of creating a hole? Drugs?

Lubomir Rintel <lkundrak at v3.sk>

--- netbsd-iscsi-20080207/src/disk.c.allocate	2008-10-03 23:56:16.000000000 +0200
+++ netbsd-iscsi-20080207/src/disk.c	2008-10-03 23:57:06.000000000 +0200
@@ -659,6 +659,7 @@
 	}
 }
 
+#if 0
 /* allocate some space for a disk/extent, using an lseek, read and write combination */
 static int
 de_allocate(disc_de_t *de, char *filename)
@@ -705,6 +706,7 @@
 	}
 	return 0;
 }
+#endif
 
 /* copy src to dst, of size `n' bytes, padding any extra with `pad' */
 static void
@@ -803,10 +805,12 @@
 		iscsi_trace_error(__FILE__, __LINE__, "error opening \"%s\"\n", disks.v[disks.c].filename);
 		return -1;
 	}
+#if 0
 	if (!(tp->flags & TARGET_READONLY) && !allocate_space(tp)) {
 		iscsi_trace_error(__FILE__, __LINE__, "error allocating space for \"%s\"", tp->target);
 		return -1;
 	}
+#endif
 	printf("%" PRIu64 " MB %sdisk storage for \"%s\"\n",
 		(de_getsize(&tp->de) / MB(1)),
 		(tp->flags & TARGET_READONLY) ? "readonly " : "",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbsd-iscsi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Dec 2007 10:48:51 -0000	1.2
+++ .cvsignore	3 Oct 2008 22:13:01 -0000	1.3
@@ -1 +1 @@
-netbsd-iscsi-20071205.tar.gz
+netbsd-iscsi-20080207.tar.gz


Index: netbsd-iscsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbsd-iscsi/devel/netbsd-iscsi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netbsd-iscsi.spec	28 Jul 2008 16:33:00 -0000	1.3
+++ netbsd-iscsi.spec	3 Oct 2008 22:13:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           netbsd-iscsi
-Version:        20071205
-Release:        3%{?dist}
+Version:        20080207
+Release:        1%{?dist}
 Summary:        User-space implementation of iSCSI target from NetBSD project
 
 Group:          System Environment/Daemons
@@ -11,6 +11,7 @@
 Source2:        netbsd-iscsi.sysconfig
 Patch0:         netbsd-iscsi-20071205-linux.patch
 Patch1:         netbsd-iscsi-20071205-utf8.patch
+Patch2:         netbsd-iscsi-20080207-allocate.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -29,6 +30,7 @@
 %setup -q
 %patch0 -p1 -b .linux
 %patch1 -p1 -b .utf8
+%patch2 -p1 -b .allocate
 
 
 %build
@@ -49,7 +51,7 @@
 
 install -m 755 src/iscsi-target $RPM_BUILD_ROOT%{_sbindir}
 install -m 644 src/iscsi-target.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 644 src/targets      $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
+install -m 644 src/etc/targets  $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
 install -m 644 src/targets.5    $RPM_BUILD_ROOT%{_mandir}/man5
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/netbsd-iscsi
@@ -91,6 +93,10 @@
 
 
 %changelog
+* Fri Oct 3 2008 Lubomir Rintel <lkundrak at v3.sk> - 20080207-1
+- Update to more recent upstream code
+- Remove the silly prealocation code (#465533)
+
 * Mon Jul 28 2008 Lubomir Rintel <lkundrak at v3.sk> 20071205-3
 - Init script (thanks to Saturo Sato)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbsd-iscsi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Dec 2007 10:48:51 -0000	1.2
+++ sources	3 Oct 2008 22:13:01 -0000	1.3
@@ -1 +1 @@
-30be23ff85a1a13d782e7d1d04319536  netbsd-iscsi-20071205.tar.gz
+26f43f0a906a9611cb1d802857fea5d3  netbsd-iscsi-20080207.tar.gz




More information about the fedora-extras-commits mailing list