Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- updated release to beta-03

  • Loading branch information...
commit 11ae2d553abfefd141bc3a0ee4d4d42de1bfdc8a 1 parent 685a6e4
authored September 29, 2010
2  META
... ...
@@ -1,6 +1,6 @@
1 1
 Meta:         1
2 2
 Name:         spl
3 3
 Branch:       1.0
4  
-Version:      0.4.7
  4
+Version:      beta-03
5 5
 Release:      1
6 6
 Release-Tags: relext
17  Makefile.in
... ...
@@ -1,4 +1,4 @@
1  
-# Makefile.in generated by automake 1.11 from Makefile.am.
  1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -349,7 +349,7 @@ distclean-libtool:
349 349
 #     (which will cause the Makefiles to be regenerated when you run `make');
350 350
 # (2) otherwise, pass the desired values on the `make' command line.
351 351
 $(RECURSIVE_TARGETS):
352  
-	@failcom='exit 1'; \
  352
+	@fail= failcom='exit 1'; \
353 353
 	for f in x $$MAKEFLAGS; do \
354 354
 	  case $$f in \
355 355
 	    *=* | --[!k]*);; \
@@ -374,7 +374,7 @@ $(RECURSIVE_TARGETS):
374 374
 	fi; test -z "$$fail"
375 375
 
376 376
 $(RECURSIVE_CLEAN_TARGETS):
377  
-	@failcom='exit 1'; \
  377
+	@fail= failcom='exit 1'; \
378 378
 	for f in x $$MAKEFLAGS; do \
379 379
 	  case $$f in \
380 380
 	    *=* | --[!k]*);; \
@@ -536,7 +536,8 @@ distdir: $(DISTFILES)
536 536
 	  fi; \
537 537
 	done
538 538
 	-test -n "$(am__skip_mode_fix)" \
539  
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  539
+	|| find "$(distdir)" -type d ! -perm -755 \
  540
+		-exec chmod u+rwx,go+rx {} \; -o \
540 541
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
541 542
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
542 543
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -581,17 +582,17 @@ dist dist-all: distdir
581 582
 distcheck: dist
582 583
 	case '$(DIST_ARCHIVES)' in \
583 584
 	*.tar.gz*) \
584  
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
  585
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
585 586
 	*.tar.bz2*) \
586  
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
  587
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
587 588
 	*.tar.lzma*) \
588  
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
  589
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
589 590
 	*.tar.xz*) \
590 591
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
591 592
 	*.tar.Z*) \
592 593
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
593 594
 	*.shar.gz*) \
594  
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
  595
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
595 596
 	*.zip*) \
596 597
 	  unzip $(distdir).zip ;;\
597 598
 	esac
2  cmd/Makefile.in
... ...
@@ -1,4 +1,4 @@
1  
-# Makefile.in generated by automake 1.11 from Makefile.am.
  1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2  include/Makefile.in
... ...
@@ -1,4 +1,4 @@
1  
-# Makefile.in generated by automake 1.11 from Makefile.am.
  1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2  lib/Makefile.in
... ...
@@ -1,4 +1,4 @@
1  
-# Makefile.in generated by automake 1.11 from Makefile.am.
  1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2  scripts/Makefile.in
... ...
@@ -1,4 +1,4 @@
1  
-# Makefile.in generated by automake 1.11 from Makefile.am.
  1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
0  spl-0.4.7/include/sys/vnode.h.orig
No changes.
19  spl-0.4.7/include/sys/vnode.h.rej
... ...
@@ -0,0 +1,19 @@
  1
+--- spl-0.4.7/include/sys/vnode.h	Mon Sep 20 21:45:55 2010 +0530
  2
++++ spl-0.4.7/include/sys/vnode.h	Wed Sep 29 16:04:02 2010 +0530
  3
+@@ -144,7 +144,7 @@
  4
+     gid_t       va_gid;		/* owner gid */
  5
+     long		va_fsid;	/* fs id */
  6
+     long		va_nodeid;	/* node # */
  7
+-    short		va_nlink;	/* # links */
  8
++    uint32_t	va_nlink;	/* # links */
  9
+     u_long		va_size;	/* file size */
  10
+     uint32_t	va_blocksize;	/* block size */
  11
+     struct timespec va_atime;	/* last acc */
  12
+@@ -327,6 +327,7 @@
  13
+ 
  14
+ /* root of its file system */
  15
+ #define VROOT 0x01
  16
++#define VMMAPPED 0x02
  17
+ 
  18
+ void
  19
+ zfs_inactive(vnode_t *vp, struct cred *cr, caller_context_t *ct);
0  spl-0.4.7/module/spl/spl-vnode.c.orig
No changes.
13  spl-0.4.7/module/spl/spl-vnode.c.rej
... ...
@@ -0,0 +1,13 @@
  1
+--- spl-0.4.7/module/spl/spl-vnode.c	Mon Sep 20 21:45:55 2010 +0530
  2
++++ spl-0.4.7/module/spl/spl-vnode.c	Wed Sep 29 16:04:02 2010 +0530
  3
+@@ -372,8 +372,8 @@
  4
+ #else
  5
+         up(&nd.nd_dentry->d_inode->i_sem);
  6
+ #endif /* HAVE_INODE_I_MUTEX */
  7
+-        if (inode)
  8
+-                iput(inode);    /* truncate the inode here */
  9
++		if (inode)
  10
++			iput(inode);    /* truncate the inode here */
  11
+ exit1:
  12
+         vn_path_release(&nd);
  13
+ exit:

0 notes on commit 11ae2d5

Please sign in to comment.
Something went wrong with that request. Please try again.