Re: [-mm patch] #if 0 fs/gfs2/acl.c:gfs2_check_acl()

Steven Whitehouse
2006-11-29T10:15:03Z

Hi,

A better solution is just to remove it I think, so thats what I'll do in
my git tree. Thanks for pointing it out,

Steve.

On Wed, 2006-11-29 at 11:04 +0100, Adrian Bunk wrote:
> On Tue, Nov 28, 2006 at 02:02:46AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.19-rc6-mm1:
> >...
> > git-gfs2-nmw.patch
> >...
> > git trees
> >...
>
>
> This patch #if 0's the no longer used gfs2_check_acl().
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> ---
>
> fs/gfs2/acl.c | 2 ++
> fs/gfs2/acl.h | 1 -
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> --- linux-2.6.19-rc6-mm2/fs/gfs2/acl.h.old 2006-11-29 08:49:13.000000000 +0100
> +++ linux-2.6.19-rc6-mm2/fs/gfs2/acl.h 2006-11-29 08:49:22.000000000 +0100
> @@ -32,7 +32,6 @@
> int *remove, mode_t *mode);
> int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access);
> int gfs2_check_acl_locked(struct inode *inode, int mask);
> -int gfs2_check_acl(struct inode *inode, int mask);
> int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip);
> int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);
>
> --- linux-2.6.19-rc6-mm2/fs/gfs2/acl.c.old 2006-11-29 08:49:31.000000000 +0100
> +++ linux-2.6.19-rc6-mm2/fs/gfs2/acl.c 2006-11-29 08:49:45.000000000 +0100
> @@ -170,6 +170,7 @@
> return -EAGAIN;
> }
>
> +#if 0
> int gfs2_check_acl(struct inode *inode, int mask)
> {
> struct gfs2_inode *ip = GFS2_I(inode);
> @@ -184,6 +185,7 @@
>
> return error;
> }
> +#endif /* 0 */
>
> static int munge_mode(struct gfs2_inode *ip, mode_t mode)
> {
>