diff options
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index a007ca0711d9..396ef36dcd0a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -90,9 +90,9 @@ xfs_update_prealloc_flags(  	}  	if (flags & XFS_PREALLOC_SET) -		ip->i_d.di_flags |= XFS_DIFLAG_PREALLOC; +		ip->i_diflags |= XFS_DIFLAG_PREALLOC;  	if (flags & XFS_PREALLOC_CLEAR) -		ip->i_d.di_flags &= ~XFS_DIFLAG_PREALLOC; +		ip->i_diflags &= ~XFS_DIFLAG_PREALLOC;  	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);  	if (flags & XFS_PREALLOC_SYNC) @@ -1159,10 +1159,10 @@ xfs_file_remap_range(  	 */  	cowextsize = 0;  	if (pos_in == 0 && len == i_size_read(inode_in) && -	    (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) && +	    (src->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE) &&  	    pos_out == 0 && len >= i_size_read(inode_out) && -	    !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) -		cowextsize = src->i_d.di_cowextsize; +	    !(dest->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)) +		cowextsize = src->i_cowextsize;  	ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,  			remap_flags); @@ -1244,7 +1244,7 @@ xfs_file_readdir(  	 * point we can change the ->readdir prototype to include the  	 * buffer size.  For now we use the current glibc buffer size.  	 */ -	bufsize = (size_t)min_t(loff_t, XFS_READDIR_BUFSIZE, ip->i_d.di_size); +	bufsize = (size_t)min_t(loff_t, XFS_READDIR_BUFSIZE, ip->i_disk_size);  	return xfs_readdir(NULL, ip, ctx, bufsize);  }  |