zygo: fs/btrfs: make noise for EIO: the inline function

(cherry picked from commit 7fcb906872148dc2b293d328e8afb902d1843d47)

zygo: fs/btrfs: make noise for EIO: the inline function in both necessary header files

(cherry picked from commit df25a98ca7c6659e55498721e3d7104687008c5b)

zygo: fs/btrfs: make noise for EIO: the one exception to the GSR rule

(cherry picked from commit 4b5daa5700309ceed3c27d071de962b1394a7208)

zygo: fs/btrfs: make noise for EIO: generalized exception markup
(cherry picked from commit 83201967ced2b3849ea81102e06dba672cf5fbdb)

Conflicts:
	fs/btrfs/eieio.h
	fs/btrfs/zlib.c

diff --git a/fs/btrfs/eieio.h b/fs/btrfs/eieio.h
index b162d0cc789632baa8163990369c22f924fd3c16..9163753918c1770c34f71af0b67b7228b5e4f192 100644 (file)
--- a/fs/btrfs/eieio.h
+++ b/fs/btrfs/eieio.h
@@ -2,7 +2,7 @@
 static inline int eieio(const char *func, const char *file, int line)
 {
        printk(KERN_INFO "EIO at %s %s:%d\n", func, file, line);
-       return EIO;
+       return EIO; /* not EIEIO */
 }
 
 #define EIEIO (eieio(__FUNCTION__, __FILE__, __LINE__))

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 31f71f859b9f0f1da467844f29b10d4fbbe1674b..eb59a00667e15c101e7e84d1bdf39340f079d48d 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -186,7 +186,7 @@ static int zlib_compress_pages(struct list_head *ws,
        zlib_deflateEnd(&workspace->strm);
 
        if (ret != Z_STREAM_END) {
-               ret = -EIEIO;
+               ret = -EIO; /* Too much noise for EIEIO here */
                goto out;
        }