From 02bbf3244741b0dc361dcefc33de139af9c6953a Mon Sep 17 00:00:00 2001
From: Valentine Barshak <vbarshak@ru.mvista.com>
Date: Sun, 8 Jan 2006 01:03:44 -0800
Subject: [PATCH] --- yaml --- r: 16989 b: refs/heads/master c:
 87ba81dba431232548ce29d5d224115d0c2355ac h: refs/heads/master i:   16987:
 bbda7638443ac4fb953c533d02014d78eee8bf15 v: v3

---
 [refs]             | 2 +-
 trunk/mm/fadvise.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 574acba8d3f9..7ca60f54a7dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99aef427e206f4ae7dcf0b18f66416145fea5d20
+refs/heads/master: 87ba81dba431232548ce29d5d224115d0c2355ac
diff --git a/trunk/mm/fadvise.c b/trunk/mm/fadvise.c
index 5f19e87bc5af..d257c89e7704 100644
--- a/trunk/mm/fadvise.c
+++ b/trunk/mm/fadvise.c
@@ -37,6 +37,11 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
 	if (!file)
 		return -EBADF;
 
+	if (S_ISFIFO(file->f_dentry->d_inode->i_mode)) {
+		ret = -ESPIPE;
+		goto out;
+	}
+
 	mapping = file->f_mapping;
 	if (!mapping || len < 0) {
 		ret = -EINVAL;