Subject: Re: linux-next: manual merge of the creds tree

From: Christoph Hellwig <[email-masked]>
Date: Thu, 30 Oct 2008 04:03:43 -0400

On Thu, Oct 30, 2008 at 03:47:41PM +1100, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the creds tree got conflicts in
> fs/xfs/linux-2.6/xfs_cred.h, fs/xfs/linux-2.6/xfs_globals.h and
> fs/xfs/xfs_vnodeops.h between commit
> 959f0f5b48d25a478694e04d024cd1ca681ea4bf ("[XFS] kill sys_cred") from the
> xfs tree and commit 3634a8a33b2cd7296e265d01d606b58c22b6a557 ("CRED:
> Separate task security context from task_struct") from the creds tree.
> 
> The former mostly removed what the latter changed.  I fixed it up (see
> below - I just removed the "extern cred_t *sys_cred;" from xfs_globals.h
> and the cred_t arguments to xfs_setattr and xfs_change_file_space in
> xfs_vnodeops.h) and can carry the fix.
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> http://www.canb.auug.org.au/~sfr/
> 
> diff --cc fs/xfs/linux-2.6/xfs_cred.h
> index 98da219,8c022cd..0000000
> --- a/fs/xfs/linux-2.6/xfs_cred.h
> +++ b/fs/xfs/linux-2.6/xfs_cred.h
> @@@ -23,8 -23,14 +23,6 @@@
>   /*
>    * Credentials
>    */
> - typedef struct cred {
> - 	/* EMPTY */
> - } cred_t;
> + typedef const struct cred cred_t;
>   
>  -extern cred_t *sys_cred;
>  -
>  -/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
>  -static inline int capable_cred(cred_t *cr, int cid)
>  -{
>  -	return (cr == sys_cred) ? 1 : capable(cid);
>  -}

Looks good - eventually we'll kill the cred_t type, too.