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

Commit 163467d3 authored by Zhi Yong Wu's avatar Zhi Yong Wu Committed by Ben Myers
Browse files

xfs: factor prid related codes into xfs_get_initial_prid() 



It will be reused by the O_TMPFILE creation function.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent f9b395a8

fs/xfs/xfs_inode.c

+1 −5
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "xfs_bmap_util.h"

#include "xfs_error.h"

#include "xfs_quota.h"

#include "xfs_dinode.h"

#include "xfs_filestream.h"

#include "xfs_cksum.h"

#include "xfs_trace.h"
@@ -1169,10 +1168,7 @@ xfs_create( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return XFS_ERROR(EIO);



	if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

		prid = xfs_get_projid(dp);

	else

		prid = XFS_PROJID_DEFAULT;

	prid = xfs_get_initial_prid(dp);



	/*

	 * Make sure that we have allocated dquot(s) on disk.

fs/xfs/xfs_inode.h

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "xfs_inode_buf.h"

#include "xfs_inode_fork.h"

#include "xfs_dinode.h"



/*

 * Kernel only inode definitions
@@ -192,6 +193,15 @@ xfs_set_projid(struct xfs_inode *ip, 
	ip->i_d.di_projid_lo = (__uint16_t) (projid & 0xffff);

}



static inline prid_t

xfs_get_initial_prid(struct xfs_inode *dp)

{

	if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

		return xfs_get_projid(dp);



	return XFS_PROJID_DEFAULT;

}



/*

 * In-core inode flags.

 */

fs/xfs/xfs_symlink.c

+1 −4
Original line number Diff line number Diff line
@@ -208,10 +208,7 @@ xfs_symlink( 
		return XFS_ERROR(ENAMETOOLONG);



	udqp = gdqp = NULL;

	if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

		prid = xfs_get_projid(dp);

	else

		prid = XFS_PROJID_DEFAULT;

	prid = xfs_get_initial_prid(dp);



	/*

	 * Make sure that we have allocated dquot(s) on disk.