openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: mode di_mode to vfs inode 

Move the di_mode value from the xfs_icdinode to the VFS inode, reducing
the xfs_icdinode byte another 2 bytes and collapsing another 2 byte hole
in the structure.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner 2016-02-09 16:54:58 +11:00 committed by Dave Chinner
parent 83e06f21b4
commit c19b3b05ae
18 changed files with 71 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_bmap.c
View File

@ -912,7 +912,7 @@ xfs_bmap_local_to_extents(
* We don't want to deal with the case of keeping inode data inline yet. * We don't want to deal with the case of keeping inode data inline yet.
* So sending the data fork of a regular inode is invalid. * So sending the data fork of a regular inode is invalid.
*/ */
ASSERT(!(S_ISREG(ip->i_d.di_mode) && whichfork == XFS_DATA_FORK)); ASSERT(!(S_ISREG(VFS_I(ip)->i_mode) && whichfork == XFS_DATA_FORK));
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL); ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL);
@ -1079,7 +1079,7 @@ xfs_bmap_add_attrfork_local(
if (ip->i_df.if_bytes <= XFS_IFORK_DSIZE(ip)) if (ip->i_df.if_bytes <= XFS_IFORK_DSIZE(ip))
return 0; return 0;
if (S_ISDIR(ip->i_d.di_mode)) { if (S_ISDIR(VFS_I(ip)->i_mode)) {
memset(&dargs, 0, sizeof(dargs)); memset(&dargs, 0, sizeof(dargs));
dargs.geo = ip->i_mount->m_dir_geo; dargs.geo = ip->i_mount->m_dir_geo;
dargs.dp = ip; dargs.dp = ip;
@ -1091,7 +1091,7 @@ xfs_bmap_add_attrfork_local(
return xfs_dir2_sf_to_block(&dargs); return xfs_dir2_sf_to_block(&dargs);
} }
if (S_ISLNK(ip->i_d.di_mode)) if (S_ISLNK(VFS_I(ip)->i_mode))
return xfs_bmap_local_to_extents(tp, ip, firstblock, 1, return xfs_bmap_local_to_extents(tp, ip, firstblock, 1,
flags, XFS_DATA_FORK, flags, XFS_DATA_FORK,
xfs_symlink_local_to_remote); xfs_symlink_local_to_remote);

12
fs/xfs/libxfs/xfs_dir2.c
View File

@ -176,7 +176,7 @@ xfs_dir_isempty(
{ {
xfs_dir2_sf_hdr_t *sfp; xfs_dir2_sf_hdr_t *sfp;
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
if (dp->i_d.di_size == 0) /* might happen during shutdown. */ if (dp->i_d.di_size == 0) /* might happen during shutdown. */
return 1; return 1;
if (dp->i_d.di_size > XFS_IFORK_DSIZE(dp)) if (dp->i_d.di_size > XFS_IFORK_DSIZE(dp))
@ -231,7 +231,7 @@ xfs_dir_init(
struct xfs_da_args *args; struct xfs_da_args *args;
int error; int error;
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
error = xfs_dir_ino_validate(tp->t_mountp, pdp->i_ino); error = xfs_dir_ino_validate(tp->t_mountp, pdp->i_ino);
if (error) if (error)
return error; return error;
@ -266,7 +266,7 @@ xfs_dir_createname(
int rval; int rval;
int v; /* type-checking value */ int v; /* type-checking value */
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
if (inum) { if (inum) {
rval = xfs_dir_ino_validate(tp->t_mountp, inum); rval = xfs_dir_ino_validate(tp->t_mountp, inum);
if (rval) if (rval)
@ -364,7 +364,7 @@ xfs_dir_lookup(
int v; /* type-checking value */ int v; /* type-checking value */
int lock_mode; int lock_mode;
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
XFS_STATS_INC(dp->i_mount, xs_dir_lookup); XFS_STATS_INC(dp->i_mount, xs_dir_lookup);
/* /*
@ -443,7 +443,7 @@ xfs_dir_removename(
int rval; int rval;
int v; /* type-checking value */ int v; /* type-checking value */
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
XFS_STATS_INC(dp->i_mount, xs_dir_remove); XFS_STATS_INC(dp->i_mount, xs_dir_remove);
args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS); args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
@ -505,7 +505,7 @@ xfs_dir_replace(
int rval; int rval;
int v; /* type-checking value */ int v; /* type-checking value */
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
rval = xfs_dir_ino_validate(tp->t_mountp, inum); rval = xfs_dir_ino_validate(tp->t_mountp, inum);
if (rval) if (rval)

8
fs/xfs/libxfs/xfs_inode_buf.c
View File

@ -202,13 +202,12 @@ xfs_inode_from_disk(
struct xfs_icdinode *to = &ip->i_d; struct xfs_icdinode *to = &ip->i_d;
struct inode *inode = VFS_I(ip); struct inode *inode = VFS_I(ip);
to->di_mode = be16_to_cpu(from->di_mode);
to->di_version = from ->di_version;
/* /*
* Convert v1 inodes immediately to v2 inode format as this is the * Convert v1 inodes immediately to v2 inode format as this is the
* minimum inode version format we support in the rest of the code. * minimum inode version format we support in the rest of the code.
*/ */
to->di_version = from->di_version;
if (to->di_version == 1) { if (to->di_version == 1) {
set_nlink(inode, be16_to_cpu(from->di_onlink)); set_nlink(inode, be16_to_cpu(from->di_onlink));
to->di_projid_lo = 0; to->di_projid_lo = 0;
@ -238,6 +237,7 @@ xfs_inode_from_disk(
inode->i_ctime.tv_sec = (int)be32_to_cpu(from->di_ctime.t_sec); inode->i_ctime.tv_sec = (int)be32_to_cpu(from->di_ctime.t_sec);
inode->i_ctime.tv_nsec = (int)be32_to_cpu(from->di_ctime.t_nsec); inode->i_ctime.tv_nsec = (int)be32_to_cpu(from->di_ctime.t_nsec);
inode->i_generation = be32_to_cpu(from->di_gen); inode->i_generation = be32_to_cpu(from->di_gen);
inode->i_mode = be16_to_cpu(from->di_mode);
to->di_size = be64_to_cpu(from->di_size); to->di_size = be64_to_cpu(from->di_size);
to->di_nblocks = be64_to_cpu(from->di_nblocks); to->di_nblocks = be64_to_cpu(from->di_nblocks);
@ -270,7 +270,6 @@ xfs_inode_to_disk(
to->di_magic = cpu_to_be16(XFS_DINODE_MAGIC); to->di_magic = cpu_to_be16(XFS_DINODE_MAGIC);
to->di_onlink = 0; to->di_onlink = 0;
to->di_mode = cpu_to_be16(from->di_mode);
to->di_version = from->di_version; to->di_version = from->di_version;
to->di_format = from->di_format; to->di_format = from->di_format;
to->di_uid = cpu_to_be32(from->di_uid); to->di_uid = cpu_to_be32(from->di_uid);
@ -287,6 +286,7 @@ xfs_inode_to_disk(
to->di_ctime.t_nsec = cpu_to_be32(inode->i_ctime.tv_nsec); to->di_ctime.t_nsec = cpu_to_be32(inode->i_ctime.tv_nsec);
to->di_nlink = cpu_to_be32(inode->i_nlink); to->di_nlink = cpu_to_be32(inode->i_nlink);
to->di_gen = cpu_to_be32(inode->i_generation); to->di_gen = cpu_to_be32(inode->i_generation);
to->di_mode = cpu_to_be16(inode->i_mode);
to->di_size = cpu_to_be64(from->di_size); to->di_size = cpu_to_be64(from->di_size);
to->di_nblocks = cpu_to_be64(from->di_nblocks); to->di_nblocks = cpu_to_be64(from->di_nblocks);
@ -501,7 +501,7 @@ xfs_iread(
* the inode is already free and not try to mess * the inode is already free and not try to mess
* with the uninitialized part of it. * with the uninitialized part of it.
*/ */
ip->i_d.di_mode = 0; VFS_I(ip)->i_mode = 0;
} }
ASSERT(ip->i_d.di_version >= 2); ASSERT(ip->i_d.di_version >= 2);

1
fs/xfs/libxfs/xfs_inode_buf.h
View File

@ -28,7 +28,6 @@ struct xfs_dinode;
* format specific structures at the appropriate time. * format specific structures at the appropriate time.
*/ */
struct xfs_icdinode { struct xfs_icdinode {
__uint16_t di_mode; /* mode and type of file */
__int8_t di_version; /* inode version */ __int8_t di_version; /* inode version */
__int8_t di_format; /* format of di_c data */ __int8_t di_format; /* format of di_c data */
__uint16_t di_flushiter; /* incremented on flush */ __uint16_t di_flushiter; /* incremented on flush */

2
fs/xfs/libxfs/xfs_inode_fork.c
View File

@ -120,7 +120,7 @@ xfs_iformat_fork(
return -EFSCORRUPTED; return -EFSCORRUPTED;
} }
switch (ip->i_d.di_mode & S_IFMT) { switch (VFS_I(ip)->i_mode & S_IFMT) {
case S_IFIFO: case S_IFIFO:
case S_IFCHR: case S_IFCHR:
case S_IFBLK: case S_IFBLK:

4
fs/xfs/xfs_bmap_util.c
View File

@ -821,7 +821,7 @@ bool
xfs_can_free_eofblocks(struct xfs_inode *ip, bool force) xfs_can_free_eofblocks(struct xfs_inode *ip, bool force)
{ {
/* prealloc/delalloc exists only on regular files */ /* prealloc/delalloc exists only on regular files */
if (!S_ISREG(ip->i_d.di_mode)) if (!S_ISREG(VFS_I(ip)->i_mode))
return false; return false;
/* /*
@ -1726,7 +1726,7 @@ xfs_swap_extents(
xfs_lock_two_inodes(ip, tip, XFS_MMAPLOCK_EXCL); xfs_lock_two_inodes(ip, tip, XFS_MMAPLOCK_EXCL);
/* Verify that both files have the same format */ /* Verify that both files have the same format */
if ((ip->i_d.di_mode & S_IFMT) != (tip->i_d.di_mode & S_IFMT)) { if ((VFS_I(ip)->i_mode & S_IFMT) != (VFS_I(tip)->i_mode & S_IFMT)) {
error = -EINVAL; error = -EINVAL;
goto out_unlock; goto out_unlock;
} }

2
fs/xfs/xfs_dir2_readdir.c
View File

@ -665,7 +665,7 @@ xfs_readdir(
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return -EIO; return -EIO;
ASSERT(S_ISDIR(dp->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
XFS_STATS_INC(dp->i_mount, xs_dir_getdents); XFS_STATS_INC(dp->i_mount, xs_dir_getdents);
args.dp = dp; args.dp = dp;

6
fs/xfs/xfs_file.c
View File

@ -156,9 +156,9 @@ xfs_update_prealloc_flags(
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
if (!(flags & XFS_PREALLOC_INVISIBLE)) { if (!(flags & XFS_PREALLOC_INVISIBLE)) {
ip->i_d.di_mode &= ~S_ISUID; VFS_I(ip)->i_mode &= ~S_ISUID;
if (ip->i_d.di_mode & S_IXGRP) if (VFS_I(ip)->i_mode & S_IXGRP)
ip->i_d.di_mode &= ~S_ISGID; VFS_I(ip)->i_mode &= ~S_ISGID;
xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
} }

4
fs/xfs/xfs_filestream.c
View File

@ -151,7 +151,7 @@ xfs_filestream_pick_ag(
xfs_agnumber_t ag, max_ag = NULLAGNUMBER; xfs_agnumber_t ag, max_ag = NULLAGNUMBER;
int err, trylock, nscan; int err, trylock, nscan;
ASSERT(S_ISDIR(ip->i_d.di_mode)); ASSERT(S_ISDIR(VFS_I(ip)->i_mode));
/* 2% of an AG's blocks must be free for it to be chosen. */ /* 2% of an AG's blocks must be free for it to be chosen. */
minfree = mp->m_sb.sb_agblocks / 50; minfree = mp->m_sb.sb_agblocks / 50;
@ -319,7 +319,7 @@ xfs_filestream_lookup_ag(
xfs_agnumber_t startag, ag = NULLAGNUMBER; xfs_agnumber_t startag, ag = NULLAGNUMBER;
struct xfs_mru_cache_elem *mru; struct xfs_mru_cache_elem *mru;
ASSERT(S_ISREG(ip->i_d.di_mode)); ASSERT(S_ISREG(VFS_I(ip)->i_mode));
pip = xfs_filestream_get_parent(ip); pip = xfs_filestream_get_parent(ip);
if (!pip) if (!pip)

13
fs/xfs/xfs_icache.c
View File

@ -63,6 +63,9 @@ xfs_inode_alloc(
return NULL; return NULL;
} }
/* VFS doesn't initialise i_mode! */
VFS_I(ip)->i_mode = 0;
XFS_STATS_INC(mp, vn_active); XFS_STATS_INC(mp, vn_active);
ASSERT(atomic_read(&ip->i_pincount) == 0); ASSERT(atomic_read(&ip->i_pincount) == 0);
ASSERT(!spin_is_locked(&ip->i_flags_lock)); ASSERT(!spin_is_locked(&ip->i_flags_lock));
@ -98,7 +101,7 @@ void
xfs_inode_free( xfs_inode_free(
struct xfs_inode *ip) struct xfs_inode *ip)
{ {
switch (ip->i_d.di_mode & S_IFMT) { switch (VFS_I(ip)->i_mode & S_IFMT) {
case S_IFREG: case S_IFREG:
case S_IFDIR: case S_IFDIR:
case S_IFLNK: case S_IFLNK:
@ -151,12 +154,14 @@ xfs_reinit_inode(
uint32_t nlink = inode->i_nlink; uint32_t nlink = inode->i_nlink;
uint32_t generation = inode->i_generation; uint32_t generation = inode->i_generation;
uint64_t version = inode->i_version; uint64_t version = inode->i_version;
umode_t mode = inode->i_mode;
error = inode_init_always(mp->m_super, inode); error = inode_init_always(mp->m_super, inode);
set_nlink(inode, nlink); set_nlink(inode, nlink);
inode->i_generation = generation; inode->i_generation = generation;
inode->i_version = version; inode->i_version = version;
inode->i_mode = mode;
return error; return error;
} }
@ -211,7 +216,7 @@ xfs_iget_cache_hit(
/* /*
* If lookup is racing with unlink return an error immediately. * If lookup is racing with unlink return an error immediately.
*/ */
if (ip->i_d.di_mode == 0 && !(flags & XFS_IGET_CREATE)) { if (VFS_I(ip)->i_mode == 0 && !(flags & XFS_IGET_CREATE)) {
error = -ENOENT; error = -ENOENT;
goto out_error; goto out_error;
} }
@ -321,7 +326,7 @@ xfs_iget_cache_miss(
trace_xfs_iget_miss(ip); trace_xfs_iget_miss(ip);
if ((ip->i_d.di_mode == 0) && !(flags & XFS_IGET_CREATE)) { if ((VFS_I(ip)->i_mode == 0) && !(flags & XFS_IGET_CREATE)) {
error = -ENOENT; error = -ENOENT;
goto out_destroy; goto out_destroy;
} }
@ -470,7 +475,7 @@ xfs_iget(
* If we have a real type for an on-disk inode, we can setup the inode * If we have a real type for an on-disk inode, we can setup the inode
* now. If it's a new inode being created, xfs_ialloc will handle it. * now. If it's a new inode being created, xfs_ialloc will handle it.
*/ */
if (xfs_iflags_test(ip, XFS_INEW) && ip->i_d.di_mode != 0) if (xfs_iflags_test(ip, XFS_INEW) && VFS_I(ip)->i_mode != 0)
xfs_setup_existing_inode(ip); xfs_setup_existing_inode(ip);
return 0; return 0;

48
fs/xfs/xfs_inode.c
View File

@ -802,7 +802,7 @@ xfs_ialloc(
if (ip->i_d.di_version == 1) if (ip->i_d.di_version == 1)
ip->i_d.di_version = 2; ip->i_d.di_version = 2;
ip->i_d.di_mode = mode; inode->i_mode = mode;
set_nlink(inode, nlink); set_nlink(inode, nlink);
ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid()); ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());
ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid()); ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());
@ -810,9 +810,8 @@ xfs_ialloc(
if (pip && XFS_INHERIT_GID(pip)) { if (pip && XFS_INHERIT_GID(pip)) {
ip->i_d.di_gid = pip->i_d.di_gid; ip->i_d.di_gid = pip->i_d.di_gid;
if ((pip->i_d.di_mode & S_ISGID) && S_ISDIR(mode)) { if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
ip->i_d.di_mode |= S_ISGID; inode->i_mode |= S_ISGID;
}
} }
/* /*
@ -821,10 +820,9 @@ xfs_ialloc(
* (and only if the irix_sgid_inherit compatibility variable is set). * (and only if the irix_sgid_inherit compatibility variable is set).
*/ */
if ((irix_sgid_inherit) && if ((irix_sgid_inherit) &&
(ip->i_d.di_mode & S_ISGID) && (inode->i_mode & S_ISGID) &&
(!in_group_p(xfs_gid_to_kgid(ip->i_d.di_gid)))) { (!in_group_p(xfs_gid_to_kgid(ip->i_d.di_gid))))
ip->i_d.di_mode &= ~S_ISGID; inode->i_mode &= ~S_ISGID;
}
ip->i_d.di_size = 0; ip->i_d.di_size = 0;
ip->i_d.di_nextents = 0; ip->i_d.di_nextents = 0;
@ -1421,7 +1419,7 @@ xfs_link(
trace_xfs_link(tdp, target_name); trace_xfs_link(tdp, target_name);
ASSERT(!S_ISDIR(sip->i_d.di_mode)); ASSERT(!S_ISDIR(VFS_I(sip)->i_mode));
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return -EIO; return -EIO;
@ -1628,7 +1626,7 @@ xfs_release(
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
int error; int error;
if (!S_ISREG(ip->i_d.di_mode) || (ip->i_d.di_mode == 0)) if (!S_ISREG(VFS_I(ip)->i_mode) || (VFS_I(ip)->i_mode == 0))
return 0; return 0;
/* If this is a read-only mount, don't do this (would generate I/O) */ /* If this is a read-only mount, don't do this (would generate I/O) */
@ -1863,7 +1861,7 @@ xfs_inactive(
* If the inode is already free, then there can be nothing * If the inode is already free, then there can be nothing
* to clean up here. * to clean up here.
*/ */
if (ip->i_d.di_mode == 0) { if (VFS_I(ip)->i_mode == 0) {
ASSERT(ip->i_df.if_real_bytes == 0); ASSERT(ip->i_df.if_real_bytes == 0);
ASSERT(ip->i_df.if_broot_bytes == 0); ASSERT(ip->i_df.if_broot_bytes == 0);
return; return;
@ -1887,7 +1885,7 @@ xfs_inactive(
return; return;
} }
if (S_ISREG(ip->i_d.di_mode) && if (S_ISREG(VFS_I(ip)->i_mode) &&
(ip->i_d.di_size != 0 || XFS_ISIZE(ip) != 0 || (ip->i_d.di_size != 0 || XFS_ISIZE(ip) != 0 ||
ip->i_d.di_nextents > 0 || ip->i_delayed_blks > 0)) ip->i_d.di_nextents > 0 || ip->i_delayed_blks > 0))
truncate = 1; truncate = 1;
@ -1896,7 +1894,7 @@ xfs_inactive(
if (error) if (error)
return; return;
if (S_ISLNK(ip->i_d.di_mode)) if (S_ISLNK(VFS_I(ip)->i_mode))
error = xfs_inactive_symlink(ip); error = xfs_inactive_symlink(ip);
else if (truncate) else if (truncate)
error = xfs_inactive_truncate(ip); error = xfs_inactive_truncate(ip);
@ -1956,7 +1954,7 @@ xfs_iunlink(
int offset; int offset;
int error; int error;
ASSERT(ip->i_d.di_mode != 0); ASSERT(VFS_I(ip)->i_mode != 0);
/* /*
* Get the agi buffer first. It ensures lock ordering * Get the agi buffer first. It ensures lock ordering
@ -2397,7 +2395,7 @@ xfs_ifree(
ASSERT(VFS_I(ip)->i_nlink == 0); ASSERT(VFS_I(ip)->i_nlink == 0);
ASSERT(ip->i_d.di_nextents == 0); ASSERT(ip->i_d.di_nextents == 0);
ASSERT(ip->i_d.di_anextents == 0); ASSERT(ip->i_d.di_anextents == 0);
ASSERT(ip->i_d.di_size == 0 || !S_ISREG(ip->i_d.di_mode)); ASSERT(ip->i_d.di_size == 0 || !S_ISREG(VFS_I(ip)->i_mode));
ASSERT(ip->i_d.di_nblocks == 0); ASSERT(ip->i_d.di_nblocks == 0);
/* /*
@ -2411,7 +2409,7 @@ xfs_ifree(
if (error) if (error)
return error; return error;
ip->i_d.di_mode = 0; /* mark incore inode as free */ VFS_I(ip)->i_mode = 0; /* mark incore inode as free */
ip->i_d.di_flags = 0; ip->i_d.di_flags = 0;
ip->i_d.di_dmevmask = 0; ip->i_d.di_dmevmask = 0;
ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */
@ -2508,7 +2506,7 @@ xfs_remove(
{ {
xfs_mount_t *mp = dp->i_mount; xfs_mount_t *mp = dp->i_mount;
xfs_trans_t *tp = NULL; xfs_trans_t *tp = NULL;
int is_dir = S_ISDIR(ip->i_d.di_mode); int is_dir = S_ISDIR(VFS_I(ip)->i_mode);
int error = 0; int error = 0;
xfs_bmap_free_t free_list; xfs_bmap_free_t free_list;
xfs_fsblock_t first_block; xfs_fsblock_t first_block;
@ -2753,7 +2751,7 @@ xfs_cross_rename(
if (dp1 != dp2) { if (dp1 != dp2) {
dp2_flags = XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG; dp2_flags = XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG;
if (S_ISDIR(ip2->i_d.di_mode)) { if (S_ISDIR(VFS_I(ip2)->i_mode)) {
error = xfs_dir_replace(tp, ip2, &xfs_name_dotdot, error = xfs_dir_replace(tp, ip2, &xfs_name_dotdot,
dp1->i_ino, first_block, dp1->i_ino, first_block,
free_list, spaceres); free_list, spaceres);
@ -2761,7 +2759,7 @@ xfs_cross_rename(
goto out_trans_abort; goto out_trans_abort;
/* transfer ip2 ".." reference to dp1 */ /* transfer ip2 ".." reference to dp1 */
if (!S_ISDIR(ip1->i_d.di_mode)) { if (!S_ISDIR(VFS_I(ip1)->i_mode)) {
error = xfs_droplink(tp, dp2); error = xfs_droplink(tp, dp2);
if (error) if (error)
goto out_trans_abort; goto out_trans_abort;
@ -2780,7 +2778,7 @@ xfs_cross_rename(
ip2_flags |= XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG; ip2_flags |= XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG;
} }
if (S_ISDIR(ip1->i_d.di_mode)) { if (S_ISDIR(VFS_I(ip1)->i_mode)) {
error = xfs_dir_replace(tp, ip1, &xfs_name_dotdot, error = xfs_dir_replace(tp, ip1, &xfs_name_dotdot,
dp2->i_ino, first_block, dp2->i_ino, first_block,
free_list, spaceres); free_list, spaceres);
@ -2788,7 +2786,7 @@ xfs_cross_rename(
goto out_trans_abort; goto out_trans_abort;
/* transfer ip1 ".." reference to dp2 */ /* transfer ip1 ".." reference to dp2 */
if (!S_ISDIR(ip2->i_d.di_mode)) { if (!S_ISDIR(VFS_I(ip2)->i_mode)) {
error = xfs_droplink(tp, dp1); error = xfs_droplink(tp, dp1);
if (error) if (error)
goto out_trans_abort; goto out_trans_abort;
@ -2885,7 +2883,7 @@ xfs_rename(
struct xfs_inode *inodes[__XFS_SORT_INODES]; struct xfs_inode *inodes[__XFS_SORT_INODES];
int num_inodes = __XFS_SORT_INODES; int num_inodes = __XFS_SORT_INODES;
bool new_parent = (src_dp != target_dp); bool new_parent = (src_dp != target_dp);
bool src_is_directory = S_ISDIR(src_ip->i_d.di_mode); bool src_is_directory = S_ISDIR(VFS_I(src_ip)->i_mode);
int spaceres; int spaceres;
int error; int error;
@ -3014,7 +3012,7 @@ xfs_rename(
* target and source are directories and that target can be * target and source are directories and that target can be
* destroyed, or that neither is a directory. * destroyed, or that neither is a directory.
*/ */
if (S_ISDIR(target_ip->i_d.di_mode)) { if (S_ISDIR(VFS_I(target_ip)->i_mode)) {
/* /*
* Make sure target dir is empty. * Make sure target dir is empty.
*/ */
@ -3444,7 +3442,7 @@ xfs_iflush_int(
__func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip); __func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip);
goto corrupt_out; goto corrupt_out;
} }
if (S_ISREG(ip->i_d.di_mode)) { if (S_ISREG(VFS_I(ip)->i_mode)) {
if (XFS_TEST_ERROR( if (XFS_TEST_ERROR(
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) && (ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE), (ip->i_d.di_format != XFS_DINODE_FMT_BTREE),
@ -3454,7 +3452,7 @@ xfs_iflush_int(
__func__, ip->i_ino, ip); __func__, ip->i_ino, ip);
goto corrupt_out; goto corrupt_out;
} }
} else if (S_ISDIR(ip->i_d.di_mode)) { } else if (S_ISDIR(VFS_I(ip)->i_mode)) {
if (XFS_TEST_ERROR( if (XFS_TEST_ERROR(
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) && (ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE) && (ip->i_d.di_format != XFS_DINODE_FMT_BTREE) &&

4
fs/xfs/xfs_inode.h
View File

@ -88,7 +88,7 @@ static inline struct inode *VFS_I(struct xfs_inode *ip)
*/ */
static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip) static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip)
{ {
if (S_ISREG(ip->i_d.di_mode)) if (S_ISREG(VFS_I(ip)->i_mode))
return i_size_read(VFS_I(ip)); return i_size_read(VFS_I(ip));
return ip->i_d.di_size; return ip->i_d.di_size;
} }
@ -369,7 +369,7 @@ static inline int xfs_isiflocked(struct xfs_inode *ip)
*/ */
#define XFS_INHERIT_GID(pip) \ #define XFS_INHERIT_GID(pip) \
(((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \ (((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \
((pip)->i_d.di_mode & S_ISGID)) (VFS_I(pip)->i_mode & S_ISGID))
int xfs_release(struct xfs_inode *ip); int xfs_release(struct xfs_inode *ip);
void xfs_inactive(struct xfs_inode *ip); void xfs_inactive(struct xfs_inode *ip);

2
fs/xfs/xfs_inode_item.c
View File

@ -333,7 +333,6 @@ xfs_inode_to_log_dinode(
to->di_magic = XFS_DINODE_MAGIC; to->di_magic = XFS_DINODE_MAGIC;
to->di_mode = from->di_mode;
to->di_version = from->di_version; to->di_version = from->di_version;
to->di_format = from->di_format; to->di_format = from->di_format;
to->di_uid = from->di_uid; to->di_uid = from->di_uid;
@ -351,6 +350,7 @@ xfs_inode_to_log_dinode(
to->di_ctime.t_nsec = inode->i_ctime.tv_nsec; to->di_ctime.t_nsec = inode->i_ctime.tv_nsec;
to->di_nlink = inode->i_nlink; to->di_nlink = inode->i_nlink;
to->di_gen = inode->i_generation; to->di_gen = inode->i_generation;
to->di_mode = inode->i_mode;
to->di_size = from->di_size; to->di_size = from->di_size;
to->di_nblocks = from->di_nblocks; to->di_nblocks = from->di_nblocks;

14
fs/xfs/xfs_ioctl.c
View File

@ -963,7 +963,7 @@ xfs_set_diflags(
di_flags |= XFS_DIFLAG_NODEFRAG; di_flags |= XFS_DIFLAG_NODEFRAG;
if (xflags & FS_XFLAG_FILESTREAM) if (xflags & FS_XFLAG_FILESTREAM)
di_flags |= XFS_DIFLAG_FILESTREAM; di_flags |= XFS_DIFLAG_FILESTREAM;
if (S_ISDIR(ip->i_d.di_mode)) { if (S_ISDIR(VFS_I(ip)->i_mode)) {
if (xflags & FS_XFLAG_RTINHERIT) if (xflags & FS_XFLAG_RTINHERIT)
di_flags |= XFS_DIFLAG_RTINHERIT; di_flags |= XFS_DIFLAG_RTINHERIT;
if (xflags & FS_XFLAG_NOSYMLINKS) if (xflags & FS_XFLAG_NOSYMLINKS)
@ -972,7 +972,7 @@ xfs_set_diflags(
di_flags |= XFS_DIFLAG_EXTSZINHERIT; di_flags |= XFS_DIFLAG_EXTSZINHERIT;
if (xflags & FS_XFLAG_PROJINHERIT) if (xflags & FS_XFLAG_PROJINHERIT)
di_flags |= XFS_DIFLAG_PROJINHERIT; di_flags |= XFS_DIFLAG_PROJINHERIT;
} else if (S_ISREG(ip->i_d.di_mode)) { } else if (S_ISREG(VFS_I(ip)->i_mode)) {
if (xflags & FS_XFLAG_REALTIME) if (xflags & FS_XFLAG_REALTIME)
di_flags |= XFS_DIFLAG_REALTIME; di_flags |= XFS_DIFLAG_REALTIME;
if (xflags & FS_XFLAG_EXTSIZE) if (xflags & FS_XFLAG_EXTSIZE)
@ -1128,14 +1128,14 @@ xfs_ioctl_setattr_check_extsize(
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
if ((fa->fsx_xflags & FS_XFLAG_EXTSIZE) && !S_ISREG(ip->i_d.di_mode)) if ((fa->fsx_xflags & FS_XFLAG_EXTSIZE) && !S_ISREG(VFS_I(ip)->i_mode))
return -EINVAL; return -EINVAL;
if ((fa->fsx_xflags & FS_XFLAG_EXTSZINHERIT) && if ((fa->fsx_xflags & FS_XFLAG_EXTSZINHERIT) &&
!S_ISDIR(ip->i_d.di_mode)) !S_ISDIR(VFS_I(ip)->i_mode))
return -EINVAL; return -EINVAL;
if (S_ISREG(ip->i_d.di_mode) && ip->i_d.di_nextents && if (S_ISREG(VFS_I(ip)->i_mode) && ip->i_d.di_nextents &&
((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize)) ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))
return -EINVAL; return -EINVAL;
@ -1256,9 +1256,9 @@ xfs_ioctl_setattr(
* successful return from chown() * successful return from chown()
*/ */
if ((ip->i_d.di_mode & (S_ISUID|S_ISGID)) && if ((VFS_I(ip)->i_mode & (S_ISUID|S_ISGID)) &&
!capable_wrt_inode_uidgid(VFS_I(ip), CAP_FSETID)) !capable_wrt_inode_uidgid(VFS_I(ip), CAP_FSETID))
ip->i_d.di_mode &= ~(S_ISUID|S_ISGID); VFS_I(ip)->i_mode &= ~(S_ISUID|S_ISGID);
/* Change the ownerships and register project quota modifications */ /* Change the ownerships and register project quota modifications */
if (xfs_get_projid(ip) != fa->fsx_projid) { if (xfs_get_projid(ip) != fa->fsx_projid) {

12
fs/xfs/xfs_iops.c
View File

@ -459,7 +459,7 @@ xfs_vn_getattr(
stat->size = XFS_ISIZE(ip); stat->size = XFS_ISIZE(ip);
stat->dev = inode->i_sb->s_dev; stat->dev = inode->i_sb->s_dev;
stat->mode = ip->i_d.di_mode; stat->mode = inode->i_mode;
stat->nlink = inode->i_nlink; stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid; stat->uid = inode->i_uid;
stat->gid = inode->i_gid; stat->gid = inode->i_gid;
@ -506,9 +506,6 @@ xfs_setattr_mode(
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
ip->i_d.di_mode &= S_IFMT;
ip->i_d.di_mode |= mode & ~S_IFMT;
inode->i_mode &= S_IFMT; inode->i_mode &= S_IFMT;
inode->i_mode |= mode & ~S_IFMT; inode->i_mode |= mode & ~S_IFMT;
} }
@ -652,9 +649,9 @@ xfs_setattr_nonsize(
* The set-user-ID and set-group-ID bits of a file will be * The set-user-ID and set-group-ID bits of a file will be
* cleared upon successful return from chown() * cleared upon successful return from chown()
*/ */
if ((ip->i_d.di_mode & (S_ISUID|S_ISGID)) && if ((inode->i_mode & (S_ISUID|S_ISGID)) &&
!capable(CAP_FSETID)) !capable(CAP_FSETID))
ip->i_d.di_mode &= ~(S_ISUID|S_ISGID); inode->i_mode &= ~(S_ISUID|S_ISGID);
/* /*
* Change the ownerships and register quota modifications * Change the ownerships and register quota modifications
@ -764,7 +761,7 @@ xfs_setattr_size(
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
ASSERT(S_ISREG(ip->i_d.di_mode)); ASSERT(S_ISREG(inode->i_mode));
ASSERT((iattr->ia_valid & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| ASSERT((iattr->ia_valid & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET|
ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
@ -1215,7 +1212,6 @@ xfs_setup_inode(
/* make the inode look hashed for the writeback code */ /* make the inode look hashed for the writeback code */
hlist_add_fake(&inode->i_hash); hlist_add_fake(&inode->i_hash);
inode->i_mode = ip->i_d.di_mode;
inode->i_uid = xfs_uid_to_kuid(ip->i_d.di_uid); inode->i_uid = xfs_uid_to_kuid(ip->i_d.di_uid);
inode->i_gid = xfs_gid_to_kgid(ip->i_d.di_gid); inode->i_gid = xfs_gid_to_kgid(ip->i_d.di_gid);

2
fs/xfs/xfs_itable.c
View File

@ -88,7 +88,6 @@ xfs_bulkstat_one_int(
buf->bs_projid_lo = dic->di_projid_lo; buf->bs_projid_lo = dic->di_projid_lo;
buf->bs_projid_hi = dic->di_projid_hi; buf->bs_projid_hi = dic->di_projid_hi;
buf->bs_ino = ino; buf->bs_ino = ino;
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid; buf->bs_uid = dic->di_uid;
buf->bs_gid = dic->di_gid; buf->bs_gid = dic->di_gid;
buf->bs_size = dic->di_size; buf->bs_size = dic->di_size;
@ -101,6 +100,7 @@ xfs_bulkstat_one_int(
buf->bs_ctime.tv_sec = inode->i_ctime.tv_sec; buf->bs_ctime.tv_sec = inode->i_ctime.tv_sec;
buf->bs_ctime.tv_nsec = inode->i_ctime.tv_nsec; buf->bs_ctime.tv_nsec = inode->i_ctime.tv_nsec;
buf->bs_gen = inode->i_generation; buf->bs_gen = inode->i_generation;
buf->bs_mode = inode->i_mode;
buf->bs_xflags = xfs_ip2xflags(ip); buf->bs_xflags = xfs_ip2xflags(ip);
buf->bs_extsize = dic->di_extsize << mp->m_sb.sb_blocklog; buf->bs_extsize = dic->di_extsize << mp->m_sb.sb_blocklog;

2
fs/xfs/xfs_log_recover.c
View File

@ -4338,7 +4338,7 @@ xlog_recover_process_one_iunlink(
goto fail_iput; goto fail_iput;
ASSERT(VFS_I(ip)->i_nlink == 0); ASSERT(VFS_I(ip)->i_nlink == 0);
ASSERT(ip->i_d.di_mode != 0); ASSERT(VFS_I(ip)->i_mode != 0);
/* setup for the next pass */ /* setup for the next pass */
agino = be32_to_cpu(dip->di_next_unlinked); agino = be32_to_cpu(dip->di_next_unlinked);

2
fs/xfs/xfs_mount.c
View File

@ -865,7 +865,7 @@ xfs_mountfs(
ASSERT(rip != NULL); ASSERT(rip != NULL);
if (unlikely(!S_ISDIR(rip->i_d.di_mode))) { if (unlikely(!S_ISDIR(VFS_I(rip)->i_mode))) {
xfs_warn(mp, "corrupted root inode %llu: not a directory", xfs_warn(mp, "corrupted root inode %llu: not a directory",
(unsigned long long)rip->i_ino); (unsigned long long)rip->i_ino);
xfs_iunlock(rip, XFS_ILOCK_EXCL); xfs_iunlock(rip, XFS_ILOCK_EXCL);