2.6.24

 fs

 autofs4

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 692364e..7f05d6c 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -226,7 +226,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
 
    *uid = current->uid;
    *gid = current->gid;
-   *pgrp = process_group(current);
+   *pgrp = task_pgrp_nr(current);
 
    *minproto = AUTOFS_MIN_PROTO_VERSION;
    *maxproto = AUTOFS_MAX_PROTO_VERSION;
@@ -312,20 +312,18 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
    struct autofs_sb_info *sbi;
    struct autofs_info *ino;
 
-   sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
+   sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
    if (!sbi)
       goto fail_unlock;
    DPRINTK("starting up, sbi = %p",sbi);
 
-   memset(sbi, 0, sizeof(*sbi));
-
    s->s_fs_info = sbi;
    sbi->magic = AUTOFS_SBI_MAGIC;
    sbi->pipefd = -1;
    sbi->pipe = NULL;
    sbi->catatonic = 1;
    sbi->exp_timeout = 0;
-   sbi->oz_pgrp = process_group(current);
+   sbi->oz_pgrp = task_pgrp_nr(current);
    sbi->sb = s;
    sbi->version = 0;
    sbi->sub_version = 0;