Re: [PATCH] intermezzo, backport some more fixes from 2.6

Ozkan,

I would like this these come through the InterMezzo maintainer 
really.

I asked Peter Braam privately who is supposed to be maintaining InterMezzo
in 2.4.x these days.

MAINTAINERS mentions Chen Yang.

On Fri, Nov 19, 2004 at 08:28:14PM +0200, O.Sezer wrote:
> intermezzo more fixes from 2.6:
> - Don't leak a pathname ref on error
> - Don't do putname() on a nameidata.
> 

> intermezzo leak fixes from 2.6
> - Don't leak a pathname ref on error
> - Don't do putname() on a nameidata.
> 
> --- ./fs/intermezzo/vfs.c~	2004-11-17 14:39:56.000000000 +0200
> +++ ./fs/intermezzo/vfs.c	2004-11-19 20:04:07.000000000 +0200
> @@ -2194,6 +2194,7 @@
>          if ( error && error != -ENOENT ) {
>                  EXIT;
>                  unlock_kernel();
> +                putname(tmp);
>                  return error;
>          } 
>          if (error == -ENOENT)
> @@ -2240,7 +2241,7 @@
>          fd = get_unused_fd();
>          if (fd < 0) {
>                  EXIT;
> -                goto cleanup_dput;
> +                goto exit;
>          }
>  
>          {
> @@ -2250,10 +2251,9 @@
>                  if (IS_ERR(f)) {
>                          put_unused_fd(fd);
>                          fd = error;
> -                        EXIT;
> -                        goto cleanup_dput;
> -                }
> -                fd_install(fd, f);
> +                } else {
> +                        fd_install(fd, f);
> +                }
>          }
>          /* end of code that might be replaced by open_dentry */
>  
> @@ -2263,10 +2263,6 @@
>          path_release(&nd);
>          putname(tmp);
>          return fd;
> -
> -cleanup_dput:
> -        putname(&nd);
> -        goto exit;
>  }
>  
>  #ifdef CONFIG_FS_EXT_ATTR



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/