nfs: disintegrate UAPI for nfs

This is to complete part of the Userspace API (UAPI) disintegration for which
the preparatory patches were pulled recently.  After these patches, userspace
headers will be segregated into:

        include/uapi/linux/.../foo.h

for the userspace interface stuff, and:

        include/linux/.../foo.h

for the strictly kernel internal stuff.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 33 insertions, 7 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 913d6bdfdda3..21a9f5de0a21 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -421,7 +421,7 @@ sub top_of_kernel_tree {
                 }
         }
         return 1;
-    }
+}
 
 sub parse_email {
         my ($formatted_email) = @_;
@@ -1386,6 +1386,8 @@ sub process {
         my $in_header_lines = 1;
         my $in_commit_log = 0;          #Scanning lines before patch
 
+        my $non_utf8_charset = 0;
+
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1686,10 +1688,17 @@ sub process {
                         $in_commit_log = 1;
                 }
 
-# Still not yet in a patch, check for any UTF-8
-                if ($in_commit_log && $realfile =~ /^$/ &&
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+                if ($in_header_lines &&
+                    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+                    $1 !~ /utf-8/i) {
+                        $non_utf8_charset = 1;
+                }
+
+                if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
                     $rawline =~ /$NON_ASCII_UTF8/) {
-                        CHK("UTF8_BEFORE_PATCH",
+                        WARN("UTF8_BEFORE_PATCH",
                             "8-bit UTF-8 used in possible commit log\n" . $herecurr);
                 }
 
@@ -1873,6 +1882,20 @@ sub process {
                             "No space is necessary after a cast\n" . $hereprev);
                 }
 
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+                    $prevrawline =~ /^\+[ \t]*$/) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
+                }
+
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ &&
+                    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments put the trailing */ on a separate line\n" . $herecurr);
+                }
+
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments
@@ -2390,8 +2413,10 @@ sub process {
                         my $orig = $1;
                         my $level = lc($orig);
                         $level = "warn" if ($level eq "warning");
+                        my $level2 = $level;
+                        $level2 = "dbg" if ($level eq "debug");
                         WARN("PREFER_PR_LEVEL",
-                             "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+                             "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(...  to printk(KERN_$orig ...\n" . $herecurr);
                 }
 
                 if ($line =~ /\bpr_warning\s*\(/) {
@@ -2947,7 +2972,7 @@ sub process {
                         my $exceptions = qr{
                                 $Declare|
                                 module_param_named|
-                                MODULE_PARAM_DESC|
+                                MODULE_PARM_DESC|
                                 DECLARE_PER_CPU|
                                 DEFINE_PER_CPU|
                                 __typeof__\(|
@@ -3016,7 +3041,8 @@ sub process {
                                         $herectx .= raw_line($linenr, $n) . "\n";
                                 }
 
-                                if (($stmts =~ tr/;/;/) == 1) {
+                                if (($stmts =~ tr/;/;/) == 1 &&
+                                    $stmts !~ /^\s*(if|while|for|switch)\b/) {
                                         WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
                                              "Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
                                 }