fault_in_multipages_readable() throws set-but-unused error
authorDave Chinner <dchinner@redhat.com>
Sun, 25 Sep 2016 23:57:33 +0000 (09:57 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Sep 2016 01:16:44 +0000 (18:16 -0700)
When building XFS with -Werror, it now fails with:

  include/linux/pagemap.h: In function 'fault_in_multipages_readable':
  include/linux/pagemap.h:602:16: error: variable 'c' set but not used [-Werror=unused-but-set-variable]
    volatile char c;
                  ^

This is a regression caused by commit e23d4159b109 ("fix
fault_in_multipages_...() on architectures with no-op access_ok()").
Fix it by re-adding the "(void)c" trick taht was previously used to make
the compiler think the variable is used.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/pagemap.h

index 7e3d53753612205dc4ef61cb857124f2499f5894..01e84436cddfec1da8b871b6343d72a2420ba070 100644 (file)
@@ -620,6 +620,7 @@ static inline int fault_in_multipages_readable(const char __user *uaddr,
                return __get_user(c, end);
        }
 
+       (void)c;
        return 0;
 }