[PATCH 1/2] xfs: clean up minor sparse warnings

Christoph Hellwig hch at infradead.org
Wed Dec 21 10:13:50 CST 2011


> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index d99a905..2f3f56a 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -230,24 +230,22 @@ xfs_open_by_handle(
>  
>  	/* Put open permission in namei format. */
>  	permflag = hreq->oflags;
> -	if ((permflag+1) & O_ACCMODE)
> -		permflag++;
>  	if (permflag & O_TRUNC)
> -		permflag |= 2;
> +		permflag |= O_RDWR;
>  
>  	if ((!(permflag & O_APPEND) || (permflag & O_TRUNC)) &&
> -	    (permflag & FMODE_WRITE) && IS_APPEND(inode)) {
> +	    (OPEN_FMODE(permflag) & FMODE_WRITE) && IS_APPEND(inode)) {
>  		error = -XFS_ERROR(EPERM);
>  		goto out_dput;
>  	}
>  
> -	if ((permflag & FMODE_WRITE) && IS_IMMUTABLE(inode)) {
> +	if ((OPEN_FMODE(permflag) & FMODE_WRITE) && IS_IMMUTABLE(inode)) {
>  		error = -XFS_ERROR(EACCES);
>  		goto out_dput;
>  	}
>  
>  	/* Can't write directories. */
> -	if (S_ISDIR(inode->i_mode) && (permflag & FMODE_WRITE)) {
> +	if (S_ISDIR(inode->i_mode) && (OPEN_FMODE(permflag) & FMODE_WRITE)) {
>  		error = -XFS_ERROR(EISDIR);
>  		goto out_dput;
>  	}

I think this one is complicated enough that is deserves a separate
patch and a better description.

For the other small bits:


Reviewed-by: Christoph Hellwig <hch at lst.de>




More information about the xfs mailing list