lkml.org 
[lkml]   [2014]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/3] autofs - fix log print messages
On Tue, 11 Nov 2014 14:01:52 +0800 Ian Kent <raven@themaw.net> wrote:

> I guess I could make a kernel.org tree but, apart from this recent
> rename autofs4 -> autofs, the number of autofs changes hasn't warranted
> maintaining a separate tree for quite a while.
>
> It looks like the place holder under /pub/scm/linux/kernel/git/raven is
> no longer present so I expect I'd need to request that be setup.
>
> That's why I just send my patches to Andrew to include them in -next.
>
> Andrew, thoughts?

Various options.

a) redo these patches against mainline and I merge them into
3.19-rc1. Shortly after that you send me the big rename as plain
old patches or, preferably, you send Linus a git pull request. For
-rc2.

b) You run a git tree for a while.

The tree which these patches were based on seem to have more than a
plain rename. For example I get

--- fs/autofs4/autofs_i.h
+++ fs/autofs4/autofs_i.h
@@ -37,15 +37,15 @@
/* #define DEBUG */

#define DPRINTK(fmt, ...) \
- pr_debug("pid %d: %s: " fmt "\n", \
+ pr_debug(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n",\
current->pid, __func__, ##__VA_ARGS__)

#define AUTOFS_WARN(fmt, ...) \
- pr_warn("pid %d: %s: " fmt "\n", \
+ pr_warn(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__)

#define AUTOFS_ERROR(fmt, ...) \
- pr_err("pid %d: %s: " fmt "\n", \
+ pr_err(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__)

/*

But I'm seeing

#define DPRINTK(fmt, ...) \
pr_debug("pid %d: %s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__)

#define AUTOFS_WARN(fmt, ...) \
printk(KERN_WARNING "pid %d: %s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__)

#define AUTOFS_ERROR(fmt, ...) \
printk(KERN_ERR "pid %d: %s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__)

/* Unified info structure. This is pointed to by both the dentry and
ie: the comment layout was changed.


\
 
 \ /
  Last update: 2014-11-13 00:41    [W:0.082 / U:0.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site