diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:55:27 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:55:27 +1000 |
| commit | 645f9857213476407d8ed1b59619fdff7128d3e6 (patch) | |
| tree | f48e76ffa8b4af8bfa0c64d54ff96d76b61f6f65 /fs/xfs/xfs_ioctl.c | |
| parent | b076d8720d793cde04b75b4941b8774e209649b4 (diff) | |
| parent | 4ef897a27543b513351262881660147366c042a1 (diff) | |
| download | linux-stable-645f9857213476407d8ed1b59619fdff7128d3e6.tar.gz linux-stable-645f9857213476407d8ed1b59619fdff7128d3e6.tar.bz2 linux-stable-645f9857213476407d8ed1b59619fdff7128d3e6.zip | |
Merge branch 'xfs-misc-fixes-3.17-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 494237ed4a65..3799695b9249 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -736,7 +736,7 @@ xfs_ioc_space( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); - if (!(ioflags & IO_INVIS)) { + if (!(ioflags & XFS_IO_INVIS)) { ip->i_d.di_mode &= ~S_ISUID; if (ip->i_d.di_mode & S_IXGRP) ip->i_d.di_mode &= ~S_ISGID; @@ -1376,7 +1376,7 @@ xfs_ioc_getbmap( return -EINVAL; bmx.bmv_iflags = (cmd == XFS_IOC_GETBMAPA ? BMV_IF_ATTRFORK : 0); - if (ioflags & IO_INVIS) + if (ioflags & XFS_IO_INVIS) bmx.bmv_iflags |= BMV_IF_NO_DMAPI_READ; error = xfs_getbmap(ip, &bmx, xfs_getbmap_format, @@ -1520,7 +1520,7 @@ xfs_file_ioctl( int error; if (filp->f_mode & FMODE_NOCMTIME) - ioflags |= IO_INVIS; + ioflags |= XFS_IO_INVIS; trace_xfs_file_ioctl(ip); |