diff options
| author | Dave Chinner | 2016-03-07 09:30:32 +1100 |
|---|---|---|
| committer | Dave Chinner | 2016-03-07 09:30:32 +1100 |
| commit | a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f (patch) | |
| tree | 892f8d40b2267422d2d38a62acace8ed613f71a8 /fs/xfs/xfs_file.c | |
| parent | 6d247d47fbd6883f7096e0e672afbdba6286dbc4 (diff) | |
| parent | c19b3b05ae440de50fffe2ac2a9b27392a7448e9 (diff) | |
Merge branch 'xfs-gut-icdinode-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 70a4b5a2802e..ac0fd32de31e 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -156,9 +156,9 @@ xfs_update_prealloc_flags( xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); if (!(flags & XFS_PREALLOC_INVISIBLE)) { - ip->i_d.di_mode &= ~S_ISUID; - if (ip->i_d.di_mode & S_IXGRP) - ip->i_d.di_mode &= ~S_ISGID; + VFS_I(ip)->i_mode &= ~S_ISUID; + if (VFS_I(ip)->i_mode & S_IXGRP) + VFS_I(ip)->i_mode &= ~S_ISGID; xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG); } |