Re: [PATCH 6/7] ecryptfs: merge ecryptfs_inode_newsize_ok into truncate_upper

On 2026-03-31 17:37:27, Christoph Hellwig wrote:
> Both callers of ecryptfs_inode_newsize_ok call truncate_upper right
> after.  Merge ecryptfs_inode_newsize_ok into truncate_upper to simplify
> the logic.
> 
> Signed-off-by: Christoph Hellwig <[email protected]>

This one looks good to me.

Tyler

> ---
>  fs/ecryptfs/inode.c | 53 +++++++++++++++------------------------------
>  1 file changed, 17 insertions(+), 36 deletions(-)
> 
> diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
> index a7dc25fae8ee..c87ee3c6ecba 100644
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@ -736,6 +736,23 @@ static int truncate_upper(struct dentry *dentry, struct iattr *lower_ia)
>  		return 0;
>  	}
>  
> +	crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
> +	lower_size_before_truncate =
> +		upper_size_to_lower_size(crypt_stat, i_size);
> +	lower_size_after_truncate =
> +		upper_size_to_lower_size(crypt_stat, lower_ia->ia_size);
> +	if (lower_size_after_truncate > lower_size_before_truncate) {
> +		/*
> +		 * The eCryptfs inode and the new *lower* size are mixed here
> +		 * because we may not have the lower i_mutex held and/or it may
> +		 * not be appropriate to call inode_newsize_ok() with inodes
> +		 * from other filesystems.
> +		 */
> +		rc = inode_newsize_ok(inode, lower_size_after_truncate);
> +		if (rc)
> +			return rc;
> +	}
> +
>  	rc = ecryptfs_get_lower_file(dentry, inode);
>  	if (rc)
>  		return rc;
> @@ -754,7 +771,6 @@ static int truncate_upper(struct dentry *dentry, struct iattr *lower_ia)
>  		goto out;
>  	}
>  
> -	crypt_stat = &ecryptfs_inode_to_private(d_inode(dentry))->crypt_stat;
>  	if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {
>  		truncate_setsize(inode, lower_ia->ia_size);
>  		goto out;
> @@ -787,42 +803,15 @@ static int truncate_upper(struct dentry *dentry, struct iattr *lower_ia)
>  	 * We are reducing the size of the ecryptfs file, and need to know if we
>  	 * need to reduce the size of the lower file.
>  	 */
> -	lower_size_before_truncate =
> -		upper_size_to_lower_size(crypt_stat, i_size);
> -	lower_size_after_truncate =
> -		upper_size_to_lower_size(crypt_stat, lower_ia->ia_size);
>  	if (lower_size_after_truncate < lower_size_before_truncate)
>  		lower_ia->ia_size = lower_size_after_truncate;
>  	else
>  		lower_ia->ia_valid &= ~ATTR_SIZE;
> -
>  out:
>  	ecryptfs_put_lower_file(inode);
>  	return rc;
>  }
>  
> -static int ecryptfs_inode_newsize_ok(struct inode *inode, loff_t offset)
> -{
> -	struct ecryptfs_crypt_stat *crypt_stat;
> -	loff_t lower_oldsize, lower_newsize;
> -
> -	crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
> -	lower_oldsize = upper_size_to_lower_size(crypt_stat,
> -						 i_size_read(inode));
> -	lower_newsize = upper_size_to_lower_size(crypt_stat, offset);
> -	if (lower_newsize > lower_oldsize) {
> -		/*
> -		 * The eCryptfs inode and the new *lower* size are mixed here
> -		 * because we may not have the lower i_mutex held and/or it may
> -		 * not be appropriate to call inode_newsize_ok() with inodes
> -		 * from other filesystems.
> -		 */
> -		return inode_newsize_ok(inode, lower_newsize);
> -	}
> -
> -	return 0;
> -}
> -
>  /**
>   * ecryptfs_truncate
>   * @dentry: The ecryptfs layer dentry
> @@ -841,10 +830,6 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
>  	};
>  	int rc;
>  
> -	rc = ecryptfs_inode_newsize_ok(d_inode(dentry), new_length);
> -	if (rc)
> -		return rc;
> -
>  	rc = truncate_upper(dentry, &lower_ia);
>  	if (!rc && lower_ia.ia_valid & ATTR_SIZE) {
>  		struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
> @@ -936,10 +921,6 @@ static int ecryptfs_setattr(struct mnt_idmap *idmap,
>  	if (ia->ia_valid & ATTR_FILE)
>  		lower_ia.ia_file = ecryptfs_file_to_lower(ia->ia_file);
>  	if (ia->ia_valid & ATTR_SIZE) {
> -		rc = ecryptfs_inode_newsize_ok(inode, ia->ia_size);
> -		if (rc)
> -			goto out;
> -
>  		rc = truncate_upper(dentry, &lower_ia);
>  		if (rc < 0)
>  			goto out;
> -- 
> 2.47.3
>