Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c3d88df authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: tiny xfs_setattr_mode cleanup 



Remove the pointless tp argument, and properly align the local variable
declarations.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 37eb9706

fs/xfs/xfs_iops.c

+4 −6
Original line number Diff line number Diff line
@@ -459,14 +459,12 @@ xfs_vn_getattr( 


static void

xfs_setattr_mode(

	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	struct iattr		*iattr)

{

	struct inode		*inode = VFS_I(ip);

	umode_t			mode = iattr->ia_mode;



	ASSERT(tp);

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));



	ip->i_d.di_mode &= S_IFMT;
@@ -633,7 +631,7 @@ xfs_setattr_nonsize( 
	 * Change file access modes.

	 */

	if (mask & ATTR_MODE)

		xfs_setattr_mode(tp, ip, iattr);

		xfs_setattr_mode(ip, iattr);



	/*

	 * Change file access or modified times.
@@ -871,7 +869,7 @@ xfs_setattr_size( 
	 * Change file access modes.

	 */

	if (mask & ATTR_MODE)

		xfs_setattr_mode(tp, ip, iattr);

		xfs_setattr_mode(ip, iattr);



	if (mask & ATTR_CTIME) {

		inode->i_ctime = iattr->ia_ctime;