Re: linux-next: Tree for Apr 9 [ BROKEN vfs-next: fs/pipe.c ]

Re: linux-next: Tree for Apr 9 [ BROKEN vfs-next: fs/pipe.c ]

[Sedat Dilek]

[-- Attachment #1: Type: text/plain, Size: 443 bytes --]

On Tue, Apr 9, 2013 at 11:30 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20130408:
>
> The vfs tree still had its build failure so I used the version from
> next-20130405.
>

With the attached patch including a follow-up I was able to boot
today's Linux-Next.

I have reverted "Revert "pipe: fold file_operations instances in one"
from linux-next and applied the fixed correct one from vfs-next.


- Sedat -

[-- Attachment #2: 3.9.0-rc6-next20130409-2-iniza-small.patch --]
[-- Type: application/octet-stream, Size: 3635 bytes --]

Al Viro (1):
      pipe: fold file_operations instances in one

Sedat Dilek (8):
      kbuild: deb-pkg: Try to determine distribution
      kbuild: deb-pkg: Bump year in debian/copyright file
      kbuild: deb-pkg: Update git repository URL in debian/copyright file
      Merge tag 'next-20130409' of git://git.kernel.org/.../next/linux-next into Linux-Next-v20130409
      Merge branch 'deb-pkg-fixes' into 3.9.0-rc6-next20130409-1-iniza-small
      Revert "pipe: fold file_operations instances in one"
      Merge branch 'vfs-TEMP' into vfs-next-fixes
      Merge branch 'vfs-next-fixes' into 3.9.0-rc6-next20130409-2-iniza-small

 fs/pipe.c                |  7 ++++---
 localversion-next        |  1 -
 scripts/package/builddeb | 19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/fs/pipe.c b/fs/pipe.c
index b499f3b..d2c45e1 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1013,6 +1013,7 @@ static void wake_up_partner(struct pipe_inode_info *pipe)
 static int fifo_open(struct inode *inode, struct file *filp)
 {
 	struct pipe_inode_info *pipe;
+	bool is_pipe = inode->i_sb->s_magic == PIPEFS_MAGIC;
 	int kill = 0;
 	int ret;
 
@@ -1059,7 +1060,7 @@ static int fifo_open(struct inode *inode, struct file *filp)
 		if (pipe->readers++ == 0)
 			wake_up_partner(pipe);
 
-		if (!pipe->writers) {
+		if (!is_pipe && !pipe->writers) {
 			if ((filp->f_flags & O_NONBLOCK)) {
 				/* suppress POLLHUP until we have
 				 * seen a writer */
@@ -1078,14 +1079,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
 	 *  errno=ENXIO when there is no process reading the FIFO.
 	 */
 		ret = -ENXIO;
-		if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
+		if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
 			goto err;
 
 		pipe->w_counter++;
 		if (!pipe->writers++)
 			wake_up_partner(pipe);
 
-		if (!pipe->readers) {
+		if (!is_pipe && !pipe->readers) {
 			if (wait_for_partner(pipe, &pipe->r_counter))
 				goto err_wr;
 		}
diff --git a/localversion-next b/localversion-next
deleted file mode 100644
index 024c115..0000000
--- a/localversion-next
+++ /dev/null
@@ -1 +0,0 @@
--next-20130409
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index acb8650..7d7c9d8 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -172,9 +172,22 @@ else
 fi
 maintainer="$name <$email>"
 
+# Try to determine distribution
+if [ -e $(which lsb_release) ]; then
+       codename=$(lsb_release --codename --short)
+       if [ "$codename" != "" ]; then
+		distribution=$codename
+       else
+		distribution="UNRELEASED"
+		echo "WARNING: The distribution could NOT be determined!"
+       fi
+else
+       echo "HINT: Install lsb_release binary, this helps to identify your distribution!"
+fi
+
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
-linux-upstream ($packageversion) unstable; urgency=low
+linux-upstream ($packageversion) $distribution; urgency=low
 
   * Custom built Linux kernel.
 
@@ -188,10 +201,10 @@ This is a packacked upstream version of the Linux kernel.
 The sources may be found at most Linux ftp sites, including:
 ftp://ftp.kernel.org/pub/linux/kernel
 
-Copyright: 1991 - 2009 Linus Torvalds and others.
+Copyright: 1991 - 2013 Linus Torvalds and others.
 
 The git repository for mainline kernel development is at:
-git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by