Commit 51ce16d5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi

[XFS] kill XFS_DINODE_VERSION_ defines

These names don't add any value at all over just using the numerical
values.

(First sent on October 9th)
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
parent 81591fe2
...@@ -1131,7 +1131,7 @@ xfs_ioctl_setattr( ...@@ -1131,7 +1131,7 @@ xfs_ioctl_setattr(
* the superblock version number since projids didn't * the superblock version number since projids didn't
* exist before DINODE_VERSION_2 and SB_VERSION_NLINK. * exist before DINODE_VERSION_2 and SB_VERSION_NLINK.
*/ */
if (ip->i_d.di_version == XFS_DINODE_VERSION_1) if (ip->i_d.di_version == 1)
xfs_bump_ino_vers2(tp, ip); xfs_bump_ino_vers2(tp, ip);
} }
......
...@@ -18,11 +18,8 @@ ...@@ -18,11 +18,8 @@
#ifndef __XFS_DINODE_H__ #ifndef __XFS_DINODE_H__
#define __XFS_DINODE_H__ #define __XFS_DINODE_H__
#define XFS_DINODE_VERSION_1 1
#define XFS_DINODE_VERSION_2 2
#define XFS_DINODE_GOOD_VERSION(v) \
(((v) == XFS_DINODE_VERSION_1 || (v) == XFS_DINODE_VERSION_2))
#define XFS_DINODE_MAGIC 0x494e /* 'IN' */ #define XFS_DINODE_MAGIC 0x494e /* 'IN' */
#define XFS_DINODE_GOOD_VERSION(v) (((v) == 1 || (v) == 2))
typedef struct xfs_timestamp { typedef struct xfs_timestamp {
__be32 t_sec; /* timestamp seconds */ __be32 t_sec; /* timestamp seconds */
......
...@@ -321,9 +321,9 @@ xfs_ialloc_ag_alloc( ...@@ -321,9 +321,9 @@ xfs_ialloc_ag_alloc(
* able to use the file system. * able to use the file system.
*/ */
if (xfs_sb_version_hasnlink(&args.mp->m_sb)) if (xfs_sb_version_hasnlink(&args.mp->m_sb))
version = XFS_DINODE_VERSION_2; version = 2;
else else
version = XFS_DINODE_VERSION_1; version = 1;
/* /*
* Seed the new inode cluster with a random generation number. This * Seed the new inode cluster with a random generation number. This
......
...@@ -965,7 +965,7 @@ xfs_iread( ...@@ -965,7 +965,7 @@ xfs_iread(
* the new format. We don't change the version number so that we * the new format. We don't change the version number so that we
* can distinguish this from a real new format inode. * can distinguish this from a real new format inode.
*/ */
if (ip->i_d.di_version == XFS_DINODE_VERSION_1) { if (ip->i_d.di_version == 1) {
ip->i_d.di_nlink = ip->i_d.di_onlink; ip->i_d.di_nlink = ip->i_d.di_onlink;
ip->i_d.di_onlink = 0; ip->i_d.di_onlink = 0;
ip->i_d.di_projid = 0; ip->i_d.di_projid = 0;
...@@ -1139,8 +1139,8 @@ xfs_ialloc( ...@@ -1139,8 +1139,8 @@ xfs_ialloc(
* here rather than here and in the flush/logging code. * here rather than here and in the flush/logging code.
*/ */
if (xfs_sb_version_hasnlink(&tp->t_mountp->m_sb) && if (xfs_sb_version_hasnlink(&tp->t_mountp->m_sb) &&
ip->i_d.di_version == XFS_DINODE_VERSION_1) { ip->i_d.di_version == 1) {
ip->i_d.di_version = XFS_DINODE_VERSION_2; ip->i_d.di_version = 2;
/* /*
* We've already zeroed the old link count, the projid field, * We've already zeroed the old link count, the projid field,
* and the pad field. * and the pad field.
...@@ -1150,7 +1150,7 @@ xfs_ialloc( ...@@ -1150,7 +1150,7 @@ xfs_ialloc(
/* /*
* Project ids won't be stored on disk if we are using a version 1 inode. * Project ids won't be stored on disk if we are using a version 1 inode.
*/ */
if ((prid != 0) && (ip->i_d.di_version == XFS_DINODE_VERSION_1)) if ((prid != 0) && (ip->i_d.di_version == 1))
xfs_bump_ino_vers2(tp, ip); xfs_bump_ino_vers2(tp, ip);
if (pip && XFS_INHERIT_GID(pip)) { if (pip && XFS_INHERIT_GID(pip)) {
...@@ -3373,9 +3373,8 @@ xfs_iflush_int( ...@@ -3373,9 +3373,8 @@ xfs_iflush_int(
* convert back to the old inode format. If the superblock version * convert back to the old inode format. If the superblock version
* has been updated, then make the conversion permanent. * has been updated, then make the conversion permanent.
*/ */
ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || ASSERT(ip->i_d.di_version == 1 || xfs_sb_version_hasnlink(&mp->m_sb));
xfs_sb_version_hasnlink(&mp->m_sb)); if (ip->i_d.di_version == 1) {
if (ip->i_d.di_version == XFS_DINODE_VERSION_1) {
if (!xfs_sb_version_hasnlink(&mp->m_sb)) { if (!xfs_sb_version_hasnlink(&mp->m_sb)) {
/* /*
* Convert it back. * Convert it back.
...@@ -3388,8 +3387,8 @@ xfs_iflush_int( ...@@ -3388,8 +3387,8 @@ xfs_iflush_int(
* so just make the conversion to the new inode * so just make the conversion to the new inode
* format permanent. * format permanent.
*/ */
ip->i_d.di_version = XFS_DINODE_VERSION_2; ip->i_d.di_version = 2;
dip->di_version = XFS_DINODE_VERSION_2; dip->di_version = 2;
ip->i_d.di_onlink = 0; ip->i_d.di_onlink = 0;
dip->di_onlink = 0; dip->di_onlink = 0;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
......
...@@ -296,9 +296,8 @@ xfs_inode_item_format( ...@@ -296,9 +296,8 @@ xfs_inode_item_format(
* has a new version number, then we don't bother converting back. * has a new version number, then we don't bother converting back.
*/ */
mp = ip->i_mount; mp = ip->i_mount;
ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1 || ASSERT(ip->i_d.di_version == 1 || xfs_sb_version_hasnlink(&mp->m_sb));
xfs_sb_version_hasnlink(&mp->m_sb)); if (ip->i_d.di_version == 1) {
if (ip->i_d.di_version == XFS_DINODE_VERSION_1) {
if (!xfs_sb_version_hasnlink(&mp->m_sb)) { if (!xfs_sb_version_hasnlink(&mp->m_sb)) {
/* /*
* Convert it back. * Convert it back.
...@@ -311,7 +310,7 @@ xfs_inode_item_format( ...@@ -311,7 +310,7 @@ xfs_inode_item_format(
* so just make the conversion to the new inode * so just make the conversion to the new inode
* format permanent. * format permanent.
*/ */
ip->i_d.di_version = XFS_DINODE_VERSION_2; ip->i_d.di_version = 2;
ip->i_d.di_onlink = 0; ip->i_d.di_onlink = 0;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
} }
......
...@@ -139,7 +139,7 @@ xfs_bulkstat_one_dinode( ...@@ -139,7 +139,7 @@ xfs_bulkstat_one_dinode(
* the new format. We don't change the version number so that we * the new format. We don't change the version number so that we
* can distinguish this from a real new format inode. * can distinguish this from a real new format inode.
*/ */
if (dic->di_version == XFS_DINODE_VERSION_1) { if (dic->di_version == 1) {
buf->bs_nlink = be16_to_cpu(dic->di_onlink); buf->bs_nlink = be16_to_cpu(dic->di_onlink);
buf->bs_projid = 0; buf->bs_projid = 0;
} else { } else {
......
...@@ -274,9 +274,9 @@ xfs_bump_ino_vers2( ...@@ -274,9 +274,9 @@ xfs_bump_ino_vers2(
xfs_mount_t *mp; xfs_mount_t *mp;
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1); ASSERT(ip->i_d.di_version == 1);
ip->i_d.di_version = XFS_DINODE_VERSION_2; ip->i_d.di_version = 2;
ip->i_d.di_onlink = 0; ip->i_d.di_onlink = 0;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
mp = tp->t_mountp; mp = tp->t_mountp;
...@@ -308,7 +308,7 @@ xfs_bumplink( ...@@ -308,7 +308,7 @@ xfs_bumplink(
ASSERT(ip->i_d.di_nlink > 0); ASSERT(ip->i_d.di_nlink > 0);
ip->i_d.di_nlink++; ip->i_d.di_nlink++;
inc_nlink(VFS_I(ip)); inc_nlink(VFS_I(ip));
if ((ip->i_d.di_version == XFS_DINODE_VERSION_1) && if ((ip->i_d.di_version == 1) &&
(ip->i_d.di_nlink > XFS_MAXLINK_1)) { (ip->i_d.di_nlink > XFS_MAXLINK_1)) {
/* /*
* The inode has increased its number of links beyond * The inode has increased its number of links beyond
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment