diff options
Diffstat (limited to 'fs/xfs/xfs_iops.c')
| -rw-r--r-- | fs/xfs/xfs_iops.c | 114 | 
1 files changed, 65 insertions, 49 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index b24c3102fa93..405a65cd9d6b 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -542,6 +542,28 @@ xfs_setattr_time(  		inode->i_mtime = iattr->ia_mtime;  } +static int +xfs_vn_change_ok( +	struct dentry	*dentry, +	struct iattr	*iattr) +{ +	struct xfs_mount	*mp = XFS_I(d_inode(dentry))->i_mount; + +	if (mp->m_flags & XFS_MOUNT_RDONLY) +		return -EROFS; + +	if (XFS_FORCED_SHUTDOWN(mp)) +		return -EIO; + +	return setattr_prepare(dentry, iattr); +} + +/* + * Set non-size attributes of an inode. + * + * Caution: The caller of this function is responsible for calling + * setattr_prepare() or otherwise verifying the change is fine. + */  int  xfs_setattr_nonsize(  	struct xfs_inode	*ip, @@ -558,21 +580,6 @@ xfs_setattr_nonsize(  	struct xfs_dquot	*udqp = NULL, *gdqp = NULL;  	struct xfs_dquot	*olddquot1 = NULL, *olddquot2 = NULL; -	trace_xfs_setattr(ip); - -	/* If acls are being inherited, we already have this checked */ -	if (!(flags & XFS_ATTR_NOACL)) { -		if (mp->m_flags & XFS_MOUNT_RDONLY) -			return -EROFS; - -		if (XFS_FORCED_SHUTDOWN(mp)) -			return -EIO; - -		error = inode_change_ok(inode, iattr); -		if (error) -			return error; -	} -  	ASSERT((mask & ATTR_SIZE) == 0);  	/* @@ -743,8 +750,27 @@ out_dqrele:  	return error;  } +int +xfs_vn_setattr_nonsize( +	struct dentry		*dentry, +	struct iattr		*iattr) +{ +	struct xfs_inode	*ip = XFS_I(d_inode(dentry)); +	int error; + +	trace_xfs_setattr(ip); + +	error = xfs_vn_change_ok(dentry, iattr); +	if (error) +		return error; +	return xfs_setattr_nonsize(ip, iattr, 0); +} +  /*   * Truncate file.  Must have write permission and not be a directory. + * + * Caution: The caller of this function is responsible for calling + * setattr_prepare() or otherwise verifying the change is fine.   */  int  xfs_setattr_size( @@ -759,18 +785,6 @@ xfs_setattr_size(  	uint			lock_flags = 0;  	bool			did_zeroing = false; -	trace_xfs_setattr(ip); - -	if (mp->m_flags & XFS_MOUNT_RDONLY) -		return -EROFS; - -	if (XFS_FORCED_SHUTDOWN(mp)) -		return -EIO; - -	error = inode_change_ok(inode, iattr); -	if (error) -		return error; -  	ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));  	ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));  	ASSERT(S_ISREG(inode->i_mode)); @@ -882,7 +896,7 @@ xfs_setattr_size(  	if (newsize != oldsize &&  	    !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) {  		iattr->ia_ctime = iattr->ia_mtime = -			current_fs_time(inode->i_sb); +			current_time(inode);  		iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME;  	} @@ -942,16 +956,32 @@ out_trans_cancel:  	goto out_unlock;  } +int +xfs_vn_setattr_size( +	struct dentry		*dentry, +	struct iattr		*iattr) +{ +	struct xfs_inode	*ip = XFS_I(d_inode(dentry)); +	int error; + +	trace_xfs_setattr(ip); + +	error = xfs_vn_change_ok(dentry, iattr); +	if (error) +		return error; +	return xfs_setattr_size(ip, iattr); +} +  STATIC int  xfs_vn_setattr(  	struct dentry		*dentry,  	struct iattr		*iattr)  { -	struct xfs_inode	*ip = XFS_I(d_inode(dentry));  	int			error;  	if (iattr->ia_valid & ATTR_SIZE) { -		uint		iolock = XFS_IOLOCK_EXCL; +		struct xfs_inode	*ip = XFS_I(d_inode(dentry)); +		uint			iolock = XFS_IOLOCK_EXCL;  		xfs_ilock(ip, iolock);  		error = xfs_break_layouts(d_inode(dentry), &iolock, true); @@ -959,11 +989,11 @@ xfs_vn_setattr(  			xfs_ilock(ip, XFS_MMAPLOCK_EXCL);  			iolock |= XFS_MMAPLOCK_EXCL; -			error = xfs_setattr_size(ip, iattr); +			error = xfs_vn_setattr_size(dentry, iattr);  		}  		xfs_iunlock(ip, iolock);  	} else { -		error = xfs_setattr_nonsize(ip, iattr, 0); +		error = xfs_vn_setattr_nonsize(dentry, iattr);  	}  	return error; @@ -1036,9 +1066,6 @@ static const struct inode_operations xfs_inode_operations = {  	.set_acl		= xfs_set_acl,  	.getattr		= xfs_vn_getattr,  	.setattr		= xfs_vn_setattr, -	.setxattr		= generic_setxattr, -	.getxattr		= generic_getxattr, -	.removexattr		= generic_removexattr,  	.listxattr		= xfs_vn_listxattr,  	.fiemap			= xfs_vn_fiemap,  	.update_time		= xfs_vn_update_time, @@ -1059,14 +1086,11 @@ static const struct inode_operations xfs_dir_inode_operations = {  	 */  	.rmdir			= xfs_vn_unlink,  	.mknod			= xfs_vn_mknod, -	.rename2		= xfs_vn_rename, +	.rename			= xfs_vn_rename,  	.get_acl		= xfs_get_acl,  	.set_acl		= xfs_set_acl,  	.getattr		= xfs_vn_getattr,  	.setattr		= xfs_vn_setattr, -	.setxattr		= generic_setxattr, -	.getxattr		= generic_getxattr, -	.removexattr		= generic_removexattr,  	.listxattr		= xfs_vn_listxattr,  	.update_time		= xfs_vn_update_time,  	.tmpfile		= xfs_vn_tmpfile, @@ -1087,14 +1111,11 @@ static const struct inode_operations xfs_dir_ci_inode_operations = {  	 */  	.rmdir			= xfs_vn_unlink,  	.mknod			= xfs_vn_mknod, -	.rename2		= xfs_vn_rename, +	.rename			= xfs_vn_rename,  	.get_acl		= xfs_get_acl,  	.set_acl		= xfs_set_acl,  	.getattr		= xfs_vn_getattr,  	.setattr		= xfs_vn_setattr, -	.setxattr		= generic_setxattr, -	.getxattr		= generic_getxattr, -	.removexattr		= generic_removexattr,  	.listxattr		= xfs_vn_listxattr,  	.update_time		= xfs_vn_update_time,  	.tmpfile		= xfs_vn_tmpfile, @@ -1105,9 +1126,6 @@ static const struct inode_operations xfs_symlink_inode_operations = {  	.get_link		= xfs_vn_get_link,  	.getattr		= xfs_vn_getattr,  	.setattr		= xfs_vn_setattr, -	.setxattr		= generic_setxattr, -	.getxattr		= generic_getxattr, -	.removexattr		= generic_removexattr,  	.listxattr		= xfs_vn_listxattr,  	.update_time		= xfs_vn_update_time,  }; @@ -1117,9 +1135,6 @@ static const struct inode_operations xfs_inline_symlink_inode_operations = {  	.get_link		= xfs_vn_get_link_inline,  	.getattr		= xfs_vn_getattr,  	.setattr		= xfs_vn_setattr, -	.setxattr		= generic_setxattr, -	.getxattr		= generic_getxattr, -	.removexattr		= generic_removexattr,  	.listxattr		= xfs_vn_listxattr,  	.update_time		= xfs_vn_update_time,  }; @@ -1144,6 +1159,7 @@ xfs_diflags_to_iflags(  		inode->i_flags |= S_NOATIME;  	if (S_ISREG(inode->i_mode) &&  	    ip->i_mount->m_sb.sb_blocksize == PAGE_SIZE && +	    !xfs_is_reflink_inode(ip) &&  	    (ip->i_mount->m_flags & XFS_MOUNT_DAX ||  	     ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))  		inode->i_flags |= S_DAX;  |