diff options
| author |   Stefaan De Roeck <stefaan@gentoo.org> | 2008-04-04 12:39:17 +0000 |
|---|---|---|
| committer | Stefaan De Roeck <stefaan@gentoo.org> | 2008-04-04 12:39:17 +0000 |
| commit | 0efa36eeb0eda5c728a30d2a281b80ed3d588f1b (patch) | |
| tree | 3718d9e6cc4a2ef0a77786c694037644b3816a5a /net-fs | |
| parent | Fix multilist display problem, bug 215984. (diff) | |
| download | gentoo-2-0efa36eeb0eda5c728a30d2a281b80ed3d588f1b.tar.gz gentoo-2-0efa36eeb0eda5c728a30d2a281b80ed3d588f1b.tar.bz2 gentoo-2-0efa36eeb0eda5c728a30d2a281b80ed3d588f1b.zip | |
Correctly add the patches for 1.4.7_pre2-r1
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/openafs-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 | 25 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 | 29 |
3 files changed, 60 insertions, 1 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog index a8f2aa5ca9e1..7d17a6bdc046 100644 --- a/net-fs/openafs-kernel/ChangeLog +++ b/net-fs/openafs-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/openafs-kernel # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.101 2008/03/31 21:47:13 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.102 2008/04/04 12:39:16 stefaan Exp $ + + 04 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org> + +files/STABLE14-linux-flush-compare-20080402, + +files/STABLE14-linux-flush-unlock-20080402: + Correctly add the patches for 1.4.7_pre2-r1 *openafs-kernel-1.4.7_pre2 (31 Mar 2008) diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 new file mode 100644 index 000000000000..f4ed02b6801f --- /dev/null +++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 @@ -0,0 +1,25 @@ +CS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v +retrieving revision 1.81.2.62 +retrieving revision 1.81.2.63 +diff -u -r1.81.2.62 -r1.81.2.63 +--- openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62 ++++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 18:27:13 1.81.2.63 +@@ -22,7 +22,7 @@ + #include "afs/param.h" + + RCSID +- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); ++ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); + + #include "afs/sysincludes.h" + #include "afsincludes.h" +@@ -570,7 +570,7 @@ + + AFS_GLOCK(); + +- if (fp->f_flags | O_RDONLY) { /* readers dont flush */ ++ if ((fp->f_flags & O_ACCMODE) == O_RDONLY) { /* readers dont flush */ + AFS_GUNLOCK(); + return 0; + } + diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 new file mode 100644 index 000000000000..f76815810664 --- /dev/null +++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 @@ -0,0 +1,29 @@ +=================================================================== +RCS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v +retrieving revision 1.81.2.61 +retrieving revision 1.81.2.62 +diff -u -r1.81.2.61 -r1.81.2.62 +--- openafs/src/afs/LINUX/osi_vnodeops.c 2008/03/26 04:17:32 1.81.2.61 ++++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62 +@@ -22,7 +22,7 @@ + #include "afs/param.h" + + RCSID +- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); ++ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $"); + + #include "afs/sysincludes.h" + #include "afsincludes.h" +@@ -570,8 +570,10 @@ + + AFS_GLOCK(); + +- if (fp->f_flags | O_RDONLY) /* readers dont flush */ ++ if (fp->f_flags | O_RDONLY) { /* readers dont flush */ ++ AFS_GUNLOCK(); + return 0; ++ } + + credp = crref(); + vcp = VTOAFS(FILE_INODE(fp)); + |