On 09/27/2010 11:59 AM, Helmut Lichtenberg wrote:
Daniel Lezcano schrieb am 27. Sep 2010 um 11:17:12 CEST:
Daniel Lezcano schrieb am 25. Sep 2010 um 00:05:41 CEST:
It seems the patchset
http://kerneltrap.org/mailarchive/linux-kernel/2007/3/20/68572/thread
was not taken upstream.
[...]
I'm not quite clean, what this means for me now. Will this patch be included
into the next kernel or do I have to patch my current (Debian Squeeze) kernel
2.6.32-5-amd64?
May be both. I will look at resending the patchset to the upstream
kernel. If it is merged, that will take awhile before hitting a distro.
I suppose you should have to patch your kernel, except if we found a
very good reason to ask for a 2.6.32 inclusion but I doubt :/
Your link above points to a somehow lengthy discussion.
Is the inline patch from sukadev (2007-03-12) at the very top of the thread
the patch in question? Or does a patchfile float somewhere around?
Added in attachment the patch.
It applies against 2.6.36-rc5 but I think backport it to 2.6.32 is trivial.
From: Sukadev Bhattiprolu <[email protected]>
Subject: Replace pid_t in autofs4 with struct pid reference.
Make autofs4 container-friendly by caching struct pid reference rather
than pid_t and using pid_nr() to retreive a task's pid_t.
ChangeLog:
- Fix Eric Biederman's comments - Use find_get_pid() to hold a
reference to oz_pgrp and release while unmounting; separate out
changes to autofs and autofs4.
- Also rollback my earlier change to autofs_wait_queue (pid and tgid
in the wait queue are just used to write to a userspace daemon's
pipe).
- Fix Cedric's comments: retain old prototype of parse_options()
and move necessary change to its caller.
Signed-off-by: Sukadev Bhattiprolu <[email protected]>
Cc: Cedric Le Goater <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Serge Hallyn <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: [email protected]
---
fs/autofs4/autofs_i.h | 28 ++++++++++++++--------------
fs/autofs4/dev-ioctl.c | 2 +-
fs/autofs4/inode.c | 22 ++++++++++++++++------
fs/autofs4/root.c | 3 ++-
fs/autofs4/waitq.c | 4 ++--
5 files changed, 35 insertions(+), 24 deletions(-)
Index: linux-next/fs/autofs4/autofs_i.h
===================================================================
--- linux-next.orig/fs/autofs4/autofs_i.h
+++ linux-next/fs/autofs4/autofs_i.h
@@ -39,25 +39,25 @@
/* #define DEBUG */
#ifdef DEBUG
-#define DPRINTK(fmt, args...) \
-do { \
- printk(KERN_DEBUG "pid %d: %s: " fmt "\n", \
- current->pid, __func__, ##args); \
+#define DPRINTK(fmt, args...) \
+ do { \
+ printk(KERN_DEBUG "pid %d: %s: " fmt "\n", \
+ pid_nr(task_pid(current)), __func__, ##args); \
} while (0)
#else
#define DPRINTK(fmt, args...) do {} while (0)
#endif
-#define AUTOFS_WARN(fmt, args...) \
-do { \
- printk(KERN_WARNING "pid %d: %s: " fmt "\n", \
- current->pid, __func__, ##args); \
+#define AUTOFS_WARN(fmt, args...) \
+ do { \
+ printk(KERN_WARNING "pid %d: %s: " fmt "\n", \
+ pid_nr(task_pid(current)), __func__, ##args); \
} while (0)
-#define AUTOFS_ERROR(fmt, args...) \
-do { \
- printk(KERN_ERR "pid %d: %s: " fmt "\n", \
- current->pid, __func__, ##args); \
+#define AUTOFS_ERROR(fmt, args...) \
+ do { \
+ printk(KERN_ERR "pid %d: %s: " fmt "\n", \
+ pid_nr(task_pid(current)), __func__, ##args); \
} while (0)
/* Unified info structure. This is pointed to by both the dentry and
@@ -122,7 +122,7 @@ struct autofs_sb_info {
u32 magic;
int pipefd;
struct file *pipe;
- pid_t oz_pgrp;
+ struct pid *oz_pgrp;
int catatonic;
int version;
int sub_version;
@@ -156,7 +156,7 @@ static inline struct autofs_info *autofs
filesystem without "magic".) */
static inline int autofs4_oz_mode(struct autofs_sb_info *sbi) {
- return sbi->catatonic || task_pgrp_nr(current) == sbi->oz_pgrp;
+ return sbi->catatonic || task_pgrp(current) == sbi->oz_pgrp;
}
/* Does a dentry have some pending activity? */
Index: linux-next/fs/autofs4/inode.c
===================================================================
--- linux-next.orig/fs/autofs4/inode.c
+++ linux-next/fs/autofs4/inode.c
@@ -111,7 +111,7 @@ void autofs4_kill_sb(struct super_block
/* Free wait queues, close pipe */
autofs4_catatonic_mode(sbi);
-
+ put_pid(sbi->oz_pgrp);
sb->s_fs_info = NULL;
kfree(sbi);
@@ -133,7 +133,7 @@ static int autofs4_show_options(struct s
seq_printf(m, ",uid=%u", root_inode->i_uid);
if (root_inode->i_gid != 0)
seq_printf(m, ",gid=%u", root_inode->i_gid);
- seq_printf(m, ",pgrp=%d", sbi->oz_pgrp);
+ seq_printf(m, ",pgrp=%d", pid_nr(sbi->oz_pgrp));
seq_printf(m, ",timeout=%lu", sbi->exp_timeout/HZ);
seq_printf(m, ",minproto=%d", sbi->min_proto);
seq_printf(m, ",maxproto=%d", sbi->max_proto);
@@ -263,6 +263,7 @@ int autofs4_fill_super(struct super_bloc
int pipefd;
struct autofs_sb_info *sbi;
struct autofs_info *ino;
+ pid_t pgid;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -275,7 +276,7 @@ int autofs4_fill_super(struct super_bloc
sbi->pipe = NULL;
sbi->catatonic = 1;
sbi->exp_timeout = 0;
- sbi->oz_pgrp = task_pgrp_nr(current);
+ sbi->oz_pgrp = task_pgrp(current);
sbi->sb = s;
sbi->version = 0;
sbi->sub_version = 0;
@@ -314,7 +315,7 @@ int autofs4_fill_super(struct super_bloc
/* Can this call block? */
if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid,
- &sbi->oz_pgrp, &sbi->type, &sbi->min_proto,
+ &pgid, &sbi->type, &sbi->min_proto,
&sbi->max_proto)) {
printk("autofs: called with bogus options\n");
goto fail_dput;
@@ -342,12 +343,19 @@ int autofs4_fill_super(struct super_bloc
sbi->version = sbi->max_proto;
sbi->sub_version = AUTOFS_PROTO_SUBVERSION;
- DPRINTK("pipe fd = %d, pgrp = %u", pipefd, sbi->oz_pgrp);
+ DPRINTK("pipe fd = %d, pgrp = %u", pipefd, pgid);
+
+ sbi->oz_pgrp = find_get_pid(pgid);
+ if (!sbi->oz_pgrp) {
+ printk("autofs: could not find process group %d\n", pgid);
+ goto fail_dput;
+ }
+
pipe = fget(pipefd);
if (!pipe) {
printk("autofs: could not open pipe file descriptor\n");
- goto fail_dput;
+ goto fail_put_pid;
}
if (!pipe->f_op || !pipe->f_op->write)
goto fail_fput;
@@ -368,6 +376,8 @@ fail_fput:
printk("autofs: pipe file descriptor does not contain proper ops\n");
fput(pipe);
/* fall through */
+fail_put_pid:
+ put_pid(sbi->oz_pgrp);
fail_dput:
dput(root);
goto fail_free;
Index: linux-next/fs/autofs4/root.c
===================================================================
--- linux-next.orig/fs/autofs4/root.c
+++ linux-next/fs/autofs4/root.c
@@ -539,7 +539,8 @@ static struct dentry *autofs4_lookup(str
oz_mode = autofs4_oz_mode(sbi);
DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
- current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);
+ pid_nr(task_pid(current)), task_pgrp_nr(current),
+ sbi->catatonic, oz_mode);
active = autofs4_lookup_active(dentry);
if (active) {
Index: linux-next/fs/autofs4/waitq.c
===================================================================
--- linux-next.orig/fs/autofs4/waitq.c
+++ linux-next/fs/autofs4/waitq.c
@@ -387,8 +387,8 @@ int autofs4_wait(struct autofs_sb_info *
wq->ino = autofs4_get_ino(sbi);
wq->uid = current_uid();
wq->gid = current_gid();
- wq->pid = current->pid;
- wq->tgid = current->tgid;
+ wq->pid = pid_nr(task_pid(current));
+ wq->tgid = pid_nr(task_tgid(current));
wq->status = -EINTR; /* Status return if interrupted */
wq->wait_ctr = 2;
mutex_unlock(&sbi->wq_mutex);
Index: linux-next/fs/autofs4/dev-ioctl.c
===================================================================
--- linux-next.orig/fs/autofs4/dev-ioctl.c
+++ linux-next/fs/autofs4/dev-ioctl.c
@@ -377,7 +377,7 @@ static int autofs_dev_ioctl_setpipefd(st
fput(pipe);
goto out;
}
- sbi->oz_pgrp = task_pgrp_nr(current);
+ sbi->oz_pgrp = task_pgrp(current);
sbi->pipefd = pipefd;
sbi->pipe = pipe;
sbi->catatonic = 0;
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Lxc-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/lxc-users
