diff options
| author | Alex Elder <aelder@sgi.com> | 2009-10-08 13:53:44 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-10-08 13:53:44 -0500 |
| commit | e09d39968bd8befa087f10f970fa236e8694b643 (patch) | |
| tree | 393f4cdd32504ed435b7a5f728cf74855378459d /fs/xfs/xfs_dfrag.c | |
| parent | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (diff) | |
| parent | d0800703febc04827b8fa91921aa4e254d01e8d1 (diff) | |
| download | kernel-crypto-e09d39968bd8befa087f10f970fa236e8694b643.tar.gz kernel-crypto-e09d39968bd8befa087f10f970fa236e8694b643.tar.xz kernel-crypto-e09d39968bd8befa087f10f970fa236e8694b643.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_dfrag.c')
| -rw-r--r-- | fs/xfs/xfs_dfrag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index 7465f9ee125..ab89a7e94a0 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c @@ -206,10 +206,10 @@ xfs_swap_extents( * process that the file was not changed out from * under it. */ - if ((sbp->bs_ctime.tv_sec != ip->i_d.di_ctime.t_sec) || - (sbp->bs_ctime.tv_nsec != ip->i_d.di_ctime.t_nsec) || - (sbp->bs_mtime.tv_sec != ip->i_d.di_mtime.t_sec) || - (sbp->bs_mtime.tv_nsec != ip->i_d.di_mtime.t_nsec)) { + if ((sbp->bs_ctime.tv_sec != VFS_I(ip)->i_ctime.tv_sec) || + (sbp->bs_ctime.tv_nsec != VFS_I(ip)->i_ctime.tv_nsec) || + (sbp->bs_mtime.tv_sec != VFS_I(ip)->i_mtime.tv_sec) || + (sbp->bs_mtime.tv_nsec != VFS_I(ip)->i_mtime.tv_nsec)) { error = XFS_ERROR(EBUSY); goto out_unlock; } |