xfs: create internal eofblocks structure with kuid_t types
Have eofblocks ioctl convert uid_t to kuid_t into internal structure. Update internal filter matching to compare ids with kuid_t types. Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
@@ -21,6 +21,14 @@
|
||||
struct xfs_mount;
|
||||
struct xfs_perag;
|
||||
|
||||
struct xfs_eofblocks {
|
||||
__u32 eof_flags;
|
||||
kuid_t eof_uid;
|
||||
kgid_t eof_gid;
|
||||
prid_t eof_prid;
|
||||
__u64 eof_min_file_size;
|
||||
};
|
||||
|
||||
#define SYNC_WAIT 0x0001 /* wait for i/o to complete */
|
||||
#define SYNC_TRYLOCK 0x0002 /* only try to lock inodes */
|
||||
|
||||
@@ -56,4 +64,39 @@ int xfs_inode_ag_iterator_tag(struct xfs_mount *mp,
|
||||
int flags, void *args),
|
||||
int flags, void *args, int tag);
|
||||
|
||||
static inline int
|
||||
xfs_fs_eofblocks_from_user(
|
||||
struct xfs_fs_eofblocks *src,
|
||||
struct xfs_eofblocks *dst)
|
||||
{
|
||||
if (src->eof_version != XFS_EOFBLOCKS_VERSION)
|
||||
return EINVAL;
|
||||
|
||||
if (src->eof_flags & ~XFS_EOF_FLAGS_VALID)
|
||||
return EINVAL;
|
||||
|
||||
if (memchr_inv(&src->pad32, 0, sizeof(src->pad32)) ||
|
||||
memchr_inv(src->pad64, 0, sizeof(src->pad64)))
|
||||
return EINVAL;
|
||||
|
||||
dst->eof_flags = src->eof_flags;
|
||||
dst->eof_prid = src->eof_prid;
|
||||
dst->eof_min_file_size = src->eof_min_file_size;
|
||||
|
||||
dst->eof_uid = INVALID_UID;
|
||||
if (src->eof_flags & XFS_EOF_FLAGS_UID) {
|
||||
dst->eof_uid = make_kuid(current_user_ns(), src->eof_uid);
|
||||
if (!uid_valid(dst->eof_uid))
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
dst->eof_gid = INVALID_GID;
|
||||
if (src->eof_flags & XFS_EOF_FLAGS_GID) {
|
||||
dst->eof_gid = make_kgid(current_user_ns(), src->eof_gid);
|
||||
if (!gid_valid(dst->eof_gid))
|
||||
return EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user