diff options
Diffstat (limited to 'fs/xfs/xfs_trans_inode.c')
| -rw-r--r-- | fs/xfs/xfs_trans_inode.c | 19 | 
1 files changed, 3 insertions, 16 deletions
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c index 07cea592dc01..542927321a61 100644 --- a/fs/xfs/xfs_trans_inode.c +++ b/fs/xfs/xfs_trans_inode.c @@ -1,19 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Copyright (c) 2000,2005 Silicon Graphics, Inc.   * All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write the Free Software Foundation, - * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA   */  #include "xfs.h"  #include "xfs_fs.h" @@ -70,7 +58,7 @@ xfs_trans_ichgtime(  	int			flags)  {  	struct inode		*inode = VFS_I(ip); -	struct timespec		tv; +	struct timespec64 tv;  	ASSERT(tp);  	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); @@ -133,14 +121,13 @@ xfs_trans_log_inode(  	 * set however, then go ahead and bump the i_version counter  	 * unconditionally.  	 */ -	if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) && +	if (!test_and_set_bit(XFS_LI_DIRTY, &ip->i_itemp->ili_item.li_flags) &&  	    IS_I_VERSION(VFS_I(ip))) {  		if (inode_maybe_inc_iversion(VFS_I(ip), flags & XFS_ILOG_CORE))  			flags |= XFS_ILOG_CORE;  	}  	tp->t_flags |= XFS_TRANS_DIRTY; -	ip->i_itemp->ili_item.li_desc->lid_flags |= XFS_LID_DIRTY;  	/*  	 * Always OR in the bits from the ili_last_fields field.  |