Hello community,
here is the log from the commit of package kernel-source
checked in at Sun Apr 30 17:53:26 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-04-28 16:23:17.000000000 +0200
+++ STABLE/kernel-source/kernel-bigsmp.changes 2006-04-29 20:44:48.000000000 +0200
@@ -1,0 +2,13 @@
+Sat Apr 29 20:44:33 CEST 2006 - agruen@suse.de
+
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+
+-------------------------------------------------------------------
+Sat Apr 29 18:01:30 CEST 2006 - agruen@suse.de
+
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-smp.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
New:
----
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:43.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.16.11
-Release: 10
+Release: 12
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -114,7 +114,7 @@
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -441,6 +441,13 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:43.000000000 +0200
@@ -17,7 +17,7 @@
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
Version: 2.6.16.11
-Release: 10
+Release: 12
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
@@ -41,6 +41,13 @@
/etc/dummy
%changelog -n kernel-dummy
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:43.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.16.11
-Release: 10
+Release: 12
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -115,7 +115,7 @@
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -442,6 +442,13 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
kernel-kdump.spec: same change
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:44.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:44.000000000 +0200
@@ -20,7 +20,7 @@
BuildRequires: python
%endif
Version: 2.6.16.11
-Release: 10
+Release: 12
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -129,7 +129,7 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -456,6 +456,13 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:44.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:44.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.16.11
-Release: 10
+Release: 12
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -112,7 +112,7 @@
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -439,6 +439,13 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
kernel-smp.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:44.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:44.000000000 +0200
@@ -25,7 +25,7 @@
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
Version: 2.6.16.11
-Release: 10
+Release: 12
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -93,7 +93,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -274,6 +274,13 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:44.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:44.000000000 +0200
@@ -49,7 +49,7 @@
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
Version: 2.6.16.11
-Release: 10
+Release: 12
Requires: linux
Requires: kernel-source = 2.6.16.11-%release
Source11: arch-symbols
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
@@ -128,6 +128,13 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.8yDPHi/_old 2006-04-30 17:51:44.000000000 +0200
+++ /var/tmp/diff_new_pack.8yDPHi/_new 2006-04-30 17:51:44.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.16.11
-Release: 10
+Release: 12
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -115,7 +115,7 @@
-Source Timestamp: 2006/04/28 14:20:20 UTC
+Source Timestamp: 2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -442,6 +442,13 @@
%files -f kernel.files
%changelog -n kernel-um
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/nfs-acl-caching.diff: "No acl" entry put in
+ client-side acl cache instead of "not cached" (171059).
+* Sat Apr 29 2006 - agruen@suse.de
+- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Improved fix
+ based on a comment by Neil Brown. Also disable NFSv4 support
+ on the client side (169033).
* Fri Apr 28 2006 - agruen@suse.de
- patches.fixes/disable-nfsv4-posix-acl-hack.diff: Disable NFSv4
deamon-side POSIX ACL <=> NFSv4 ACL mapping (169033).
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-04-28 16:23:10.000000000 +0200
+++ STABLE/kernel-source/build-source-timestamp 2006-04-29 20:44:41.000000000 +0200
@@ -1,2 +1,2 @@
-2006/04/28 14:20:20 UTC
+2006/04/29 18:43:22 UTC
CVS Branch: SL101_BRANCH
++++++ minmem ++++++
--- kernel-source/minmem 2006-04-28 21:58:46.000000000 +0200
+++ STABLE/kernel-source/minmem 2006-04-29 20:44:43.000000000 +0200
@@ -1 +1 @@
-514000
+1048576
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/disable-nfsv4-posix-acl-hack.diff new/patches.fixes/disable-nfsv4-posix-acl-hack.diff
--- old/patches.fixes/disable-nfsv4-posix-acl-hack.diff 2006-04-28 16:20:04.000000000 +0200
+++ new/patches.fixes/disable-nfsv4-posix-acl-hack.diff 2006-04-29 18:01:17.000000000 +0200
@@ -27,53 +27,60 @@
already, so adding NFSv4 support should not be be very hard.
-This patch disables the NFSv4 ACL mapping in nfsd.
+This patch disables the POSIX ACL to NFSv4 ACL mapping in nfsd.
+
+Because the POSIX ACL to NFSv4 ACL mapping found its way into the
+upstream kernel, vanilla kernels will currently report that they
+support NFSv4 ACLs, while they really only support POSIX ACLs. To
+avoid the interoperability problems this would cause, also turn off
+NFSv4 ACL support in the client.
Signed-off-by: Andreas Gruenbacher
-Index: linux-2.6.16/fs/nfsd/nfs4xdr.c
+Index: linux-2.6.16/fs/nfs/nfs4proc.c
===================================================================
---- linux-2.6.16.orig/fs/nfsd/nfs4xdr.c
-+++ linux-2.6.16/fs/nfsd/nfs4xdr.c
-@@ -264,6 +264,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
- READ64(iattr->ia_size);
- iattr->ia_valid |= ATTR_SIZE;
- }
-+#if 0
- if (bmval[0] & FATTR4_WORD0_ACL) {
- int nace, i;
- struct nfs4_ace ace;
-@@ -307,6 +308,13 @@ nfsd4_decode_fattr(struct nfsd4_compound
- }
- } else
- *acl = NULL;
-+#else
-+ *acl = NULL;
-+ if (bmval[0] & FATTR4_WORD0_ACL) {
-+ status = -EOPNOTSUPP;
-+ goto out_nfserr;
-+ }
-+#endif
- if (bmval[1] & FATTR4_WORD1_MODE) {
- READ_BUF(4);
- len += 4;
-@@ -1322,6 +1330,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
- goto out;
- fhp = &tempfh;
- }
+--- linux-2.6.16.orig/fs/nfs/nfs4proc.c
++++ linux-2.6.16/fs/nfs/nfs4proc.c
+@@ -2552,9 +2552,13 @@ int nfs4_proc_renew(struct nfs4_client *
+
+ static inline int nfs4_server_supports_acls(struct nfs_server *server)
+ {
+#if 0
- if (bmval0 & (FATTR4_WORD0_ACL | FATTR4_WORD0_ACLSUPPORT
- | FATTR4_WORD0_SUPPORTED_ATTRS)) {
- status = nfsd4_get_nfs4_acl(rqstp, dentry, &acl);
-@@ -1336,6 +1345,10 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
- goto out_nfserr;
- }
- }
+ return (server->caps & NFS_CAP_ACLS)
+ && (server->acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)
+ && (server->acl_bitmask & ACL4_SUPPORT_DENY_ACL);
+#else
-+ if (bmval0 & FATTR4_WORD0_ACL)
-+ bmval0 &= ~FATTR4_WORD0_ACL;
++ return 0;
+#endif
- if ((buflen -= 16) < 0)
- goto out_resource;
+ }
+
+ /* Assuming that XATTR_SIZE_MAX is a multiple of PAGE_CACHE_SIZE, and that
+Index: linux-2.6.16/include/linux/nfsd/nfsd.h
+===================================================================
+--- linux-2.6.16.orig/include/linux/nfsd/nfsd.h
++++ linux-2.6.16/include/linux/nfsd/nfsd.h
+@@ -300,12 +300,12 @@ static inline int is_fsid(struct svc_fh
+ | FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE | FATTR4_WORD0_LINK_SUPPORT \
+ | FATTR4_WORD0_SYMLINK_SUPPORT | FATTR4_WORD0_NAMED_ATTR | FATTR4_WORD0_FSID \
+ | FATTR4_WORD0_UNIQUE_HANDLES | FATTR4_WORD0_LEASE_TIME | FATTR4_WORD0_RDATTR_ERROR \
+- | FATTR4_WORD0_ACLSUPPORT | FATTR4_WORD0_CANSETTIME | FATTR4_WORD0_CASE_INSENSITIVE \
++/*| FATTR4_WORD0_ACLSUPPORT*/ | FATTR4_WORD0_CANSETTIME | FATTR4_WORD0_CASE_INSENSITIVE \
+ | FATTR4_WORD0_CASE_PRESERVING | FATTR4_WORD0_CHOWN_RESTRICTED \
+ | FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FILEID | FATTR4_WORD0_FILES_AVAIL \
+ | FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_HOMOGENEOUS \
+ | FATTR4_WORD0_MAXFILESIZE | FATTR4_WORD0_MAXLINK | FATTR4_WORD0_MAXNAME \
+- | FATTR4_WORD0_MAXREAD | FATTR4_WORD0_MAXWRITE | FATTR4_WORD0_ACL)
++ | FATTR4_WORD0_MAXREAD | FATTR4_WORD0_MAXWRITE /*| FATTR4_WORD0_ACL*/)
+
+ #define NFSD_SUPPORTED_ATTRS_WORD1 \
+ (FATTR4_WORD1_MODE | FATTR4_WORD1_NO_TRUNC | FATTR4_WORD1_NUMLINKS \
+@@ -321,7 +321,7 @@ static inline int is_fsid(struct svc_fh
+ /* These are the only attrs allowed in CREATE/OPEN/SETATTR. */
+ #define NFSD_WRITEABLE_ATTRS_WORD0 \
+-(FATTR4_WORD0_SIZE | FATTR4_WORD0_ACL )
++(FATTR4_WORD0_SIZE /*| FATTR4_WORD0_ACL*/ )
+ #define NFSD_WRITEABLE_ATTRS_WORD1 \
+ (FATTR4_WORD1_MODE | FATTR4_WORD1_OWNER | FATTR4_WORD1_OWNER_GROUP \
+ | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY_SET)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs-acl-caching.diff new/patches.fixes/nfs-acl-caching.diff
--- old/patches.fixes/nfs-acl-caching.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/nfs-acl-caching.diff 2006-04-29 20:42:49.000000000 +0200
@@ -0,0 +1,38 @@
+From: Andreas Gruenbacher
+Subject: "No acl" entry put in client-side acl cache instead of "not cached"
+References: 171059
+
+When the acl of a file is not cached and only the default acl of that
+file is requested, a NULL "no acl" entry is put in the client-side acl
+cache of nfs instead of ERR_PTR(-EAGAIN) "not cached".
+
+Signed-off-by: Andreas Gruenbacher
+
+Index: linux-2.6.16/fs/nfs/nfs3acl.c
+===================================================================
+--- linux-2.6.16.orig/fs/nfs/nfs3acl.c
++++ linux-2.6.16/fs/nfs/nfs3acl.c
+@@ -172,8 +172,10 @@ static void nfs3_cache_acls(struct inode
+ inode->i_ino, acl, dfacl);
+ spin_lock(&inode->i_lock);
+ __nfs3_forget_cached_acls(NFS_I(inode));
+- nfsi->acl_access = posix_acl_dup(acl);
+- nfsi->acl_default = posix_acl_dup(dfacl);
++ if (!IS_ERR(acl))
++ nfsi->acl_access = posix_acl_dup(acl);
++ if (!IS_ERR(dfacl))
++ nfsi->acl_default = posix_acl_dup(dfacl);
+ spin_unlock(&inode->i_lock);
+ }
+
+@@ -250,7 +252,9 @@ struct posix_acl *nfs3_proc_getacl(struc
+ res.acl_access = NULL;
+ }
+ }
+- nfs3_cache_acls(inode, res.acl_access, res.acl_default);
++ nfs3_cache_acls(inode,
++ (res.mask & NFS_ACL) ? res.acl_access : ERR_PTR(-EINVAL),
++ (res.mask & NFS_DFACL) ? res.acl_default : ERR_PTR(-EINVAL));
+
+ switch(type) {
+ case ACL_TYPE_ACCESS:
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-04-28 16:23:12.000000000 +0200
+++ STABLE/kernel-source/series.conf 2006-04-29 20:44:42.000000000 +0200
@@ -195,6 +195,7 @@
########################################################
# nfsacl protocol (agruen)
+agruen patches.suse/nfsacl-client-cache-CHECK.diff
+ patches.fixes/nfs-acl-caching.diff
########################################################
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...