diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
| commit | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch) | |
| tree | cccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_ialloc.c | |
| parent | 0d907a3bb4a77cffebebd17c323e898048301aa3 (diff) | |
| parent | ab3e57b53f549ad51cbdf85e846ca4eaf0f3be30 (diff) | |
| download | op-kernel-dev-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip op-kernel-dev-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.gz | |
Merge branch 'xfs-feature-bit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
| -rw-r--r-- | fs/xfs/xfs_ialloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index 1313df7..e8dfaf0 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c @@ -280,10 +280,8 @@ xfs_ialloc_inode_init( if (tp) xfs_icreate_log(tp, agno, agbno, mp->m_ialloc_inos, mp->m_sb.sb_inodesize, length, gen); - } else if (xfs_sb_version_hasnlink(&mp->m_sb)) + } else version = 2; - else - version = 1; for (j = 0; j < nbufs; j++) { /* |
