xfs
[Top] [All Lists]

Re: [PATCH 1/2] CRED: Alter XFS so as to avoid namespace collisions with

To: David Howells <dhowells@xxxxxxxxxx>
Subject: Re: [PATCH 1/2] CRED: Alter XFS so as to avoid namespace collisions with upcoming COW creds
From: James Morris <jmorris@xxxxxxxxx>
Date: Wed, 13 Aug 2008 08:55:10 +1000 (EST)
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxxxxx>, sfrench@xxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, linux-security-module@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
In-reply-to: <20080812132845.5472.30943.stgit@xxxxxxxxxxxxxxxxxxxxxx>
References: <20080812132840.5472.25856.stgit@xxxxxxxxxxxxxxxxxxxxxx> <20080812132845.5472.30943.stgit@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xfs-bounce@xxxxxxxxxxx
User-agent: Alpine 1.10 (LRH 962 2008-03-14)
On Tue, 12 Aug 2008, David Howells wrote:

> Rename XFS's current_fsuid() and current_fsgid() to avoid collision with
> functions of the same name in upcoming COW creds.
> 
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>

Can we get an acked-by from an XFS maintainer before pushing this to 
Linus?

> ---
> 
>  fs/xfs/linux-2.6/xfs_linux.h |    4 ++--
>  fs/xfs/xfs_inode.c           |    4 ++--
>  fs/xfs/xfs_vnodeops.c        |    8 ++++----
>  3 files changed, 8 insertions(+), 8 deletions(-)
> 
> 
> diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
> index 4d45d93..05a2e7e 100644
> --- a/fs/xfs/linux-2.6/xfs_linux.h
> +++ b/fs/xfs/linux-2.6/xfs_linux.h
> @@ -126,8 +126,8 @@
>  
>  #define current_cpu()                (raw_smp_processor_id())
>  #define current_pid()                (current->pid)
> -#define current_fsuid(cred)  (current->fsuid)
> -#define current_fsgid(cred)  (current->fsgid)
> +#define this_fsuid(cred)     (current->fsuid)
> +#define this_fsgid(cred)     (current->fsgid)
>  #define current_test_flags(f)        (current->flags & (f))
>  #define current_set_flags_nested(sp, f)              \
>               (*(sp) = current->flags, current->flags |= (f))
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index bedc661..5e481ae 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1082,8 +1082,8 @@ xfs_ialloc(
>       ip->i_d.di_onlink = 0;
>       ip->i_d.di_nlink = nlink;
>       ASSERT(ip->i_d.di_nlink == nlink);
> -     ip->i_d.di_uid = current_fsuid(cr);
> -     ip->i_d.di_gid = current_fsgid(cr);
> +     ip->i_d.di_uid = this_fsuid(cr);
> +     ip->i_d.di_gid = this_fsgid(cr);
>       ip->i_d.di_projid = prid;
>       memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
>  
> diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
> index 76a1166..3dfe8a0 100644
> --- a/fs/xfs/xfs_vnodeops.c
> +++ b/fs/xfs/xfs_vnodeops.c
> @@ -182,7 +182,7 @@ xfs_setattr(
>       xfs_ilock(ip, lock_flags);
>  
>       /* boolean: are we the file owner? */
> -     file_owner = (current_fsuid(credp) == ip->i_d.di_uid);
> +     file_owner = (this_fsuid(credp) == ip->i_d.di_uid);
>  
>       /*
>        * Change various properties of a file.
> @@ -1536,7 +1536,7 @@ xfs_create(
>        * Make sure that we have allocated dquot(s) on disk.
>        */
>       error = XFS_QM_DQVOPALLOC(mp, dp,
> -                     current_fsuid(credp), current_fsgid(credp), prid,
> +                     this_fsuid(credp), this_fsgid(credp), prid,
>                       XFS_QMOPT_QUOTALL|XFS_QMOPT_INHERIT, &udqp, &gdqp);
>       if (error)
>               goto std_return;
> @@ -2352,7 +2352,7 @@ xfs_mkdir(
>        * Make sure that we have allocated dquot(s) on disk.
>        */
>       error = XFS_QM_DQVOPALLOC(mp, dp,
> -                     current_fsuid(credp), current_fsgid(credp), prid,
> +                     this_fsuid(credp), this_fsgid(credp), prid,
>                       XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
>       if (error)
>               goto std_return;
> @@ -2578,7 +2578,7 @@ xfs_symlink(
>        * Make sure that we have allocated dquot(s) on disk.
>        */
>       error = XFS_QM_DQVOPALLOC(mp, dp,
> -                     current_fsuid(credp), current_fsgid(credp), prid,
> +                     this_fsuid(credp), this_fsgid(credp), prid,
>                       XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
>       if (error)
>               goto std_return;
> 

-- 
James Morris
<jmorris@xxxxxxxxx>


<Prev in Thread] Current Thread [Next in Thread>
  • Re: [PATCH 1/2] CRED: Alter XFS so as to avoid namespace collisions with upcoming COW creds, James Morris <=