---

yaml --- r: 16989 b: refs/heads/master c: 87ba81d h: refs/heads/master i: 16987: bbda763 v: v3
git-mirror · Jan 9, 2006 · 02bbf32 · 02bbf32
1 parent 7bd0f0b
commit 02bbf32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;