Skip to content

Commit e7b8948

Browse files
Dave Chinnerdchinner
Dave Chinner
authored and
dchinner
committed
xfs: use FS_XFLAG definitions directly
Now that the ioctls have been hoisted up to the VFS level, use the VFs definitions directly and remove the XFS specific definitions completely. Userspace is going to have to handle the change of this interface separately, so removing the definitions from xfs_fs.h is not an issue here at all. Signed-off-by: Dave Chinner <dchinner@redhat.com>
1 parent 334e580 commit e7b8948

File tree

4 files changed

+53
-74
lines changed

4 files changed

+53
-74
lines changed

‎fs/xfs/libxfs/xfs_format.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -984,8 +984,6 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
984984

985985
/*
986986
* Values for di_flags
987-
* There should be a one-to-one correspondence between these flags and the
988-
* XFS_XFLAG_s.
989987
*/
990988
#define XFS_DIFLAG_REALTIME_BIT 0 /* file's blocks come from rt area */
991989
#define XFS_DIFLAG_PREALLOC_BIT 1 /* file space has been preallocated */

‎fs/xfs/libxfs/xfs_fs.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,6 @@ struct dioattr {
3535
};
3636
#endif
3737

38-
/*
39-
* Flags for the bs_xflags/fsx_xflags field in FS_IOC_FS[GS]ETXATTR[A]
40-
*/
41-
#define XFS_XFLAG_REALTIME FS_XFLAG_REALTIME
42-
#define XFS_XFLAG_PREALLOC FS_XFLAG_PREALLOC
43-
#define XFS_XFLAG_IMMUTABLE FS_XFLAG_IMMUTABLE
44-
#define XFS_XFLAG_APPEND FS_XFLAG_APPEND
45-
#define XFS_XFLAG_SYNC FS_XFLAG_SYNC
46-
#define XFS_XFLAG_NOATIME FS_XFLAG_NOATIME
47-
#define XFS_XFLAG_NODUMP FS_XFLAG_NODUMP
48-
#define XFS_XFLAG_RTINHERIT FS_XFLAG_RTINHERIT
49-
#define XFS_XFLAG_PROJINHERIT FS_XFLAG_PROJINHERIT
50-
#define XFS_XFLAG_NOSYMLINKS FS_XFLAG_NOSYMLINKS
51-
#define XFS_XFLAG_EXTSIZE FS_XFLAG_EXTSIZE
52-
#define XFS_XFLAG_EXTSZINHERIT FS_XFLAG_EXTSZINHERIT
53-
#define XFS_XFLAG_NODEFRAG FS_XFLAG_NODEFRAG
54-
#define XFS_XFLAG_FILESTREAM FS_XFLAG_FILESTREAM
55-
#define XFS_XFLAG_HASATTR FS_XFLAG_HASATTR
56-
5738
/*
5839
* Structure for XFS_IOC_GETBMAP.
5940
* On input, fill in bmv_offset and bmv_length of the first structure

‎fs/xfs/xfs_inode.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -616,33 +616,33 @@ _xfs_dic2xflags(
616616

617617
if (di_flags & XFS_DIFLAG_ANY) {
618618
if (di_flags & XFS_DIFLAG_REALTIME)
619-
flags |= XFS_XFLAG_REALTIME;
619+
flags |= FS_XFLAG_REALTIME;
620620
if (di_flags & XFS_DIFLAG_PREALLOC)
621-
flags |= XFS_XFLAG_PREALLOC;
621+
flags |= FS_XFLAG_PREALLOC;
622622
if (di_flags & XFS_DIFLAG_IMMUTABLE)
623-
flags |= XFS_XFLAG_IMMUTABLE;
623+
flags |= FS_XFLAG_IMMUTABLE;
624624
if (di_flags & XFS_DIFLAG_APPEND)
625-
flags |= XFS_XFLAG_APPEND;
625+
flags |= FS_XFLAG_APPEND;
626626
if (di_flags & XFS_DIFLAG_SYNC)
627-
flags |= XFS_XFLAG_SYNC;
627+
flags |= FS_XFLAG_SYNC;
628628
if (di_flags & XFS_DIFLAG_NOATIME)
629-
flags |= XFS_XFLAG_NOATIME;
629+
flags |= FS_XFLAG_NOATIME;
630630
if (di_flags & XFS_DIFLAG_NODUMP)
631-
flags |= XFS_XFLAG_NODUMP;
631+
flags |= FS_XFLAG_NODUMP;
632632
if (di_flags & XFS_DIFLAG_RTINHERIT)
633-
flags |= XFS_XFLAG_RTINHERIT;
633+
flags |= FS_XFLAG_RTINHERIT;
634634
if (di_flags & XFS_DIFLAG_PROJINHERIT)
635-
flags |= XFS_XFLAG_PROJINHERIT;
635+
flags |= FS_XFLAG_PROJINHERIT;
636636
if (di_flags & XFS_DIFLAG_NOSYMLINKS)
637-
flags |= XFS_XFLAG_NOSYMLINKS;
637+
flags |= FS_XFLAG_NOSYMLINKS;
638638
if (di_flags & XFS_DIFLAG_EXTSIZE)
639-
flags |= XFS_XFLAG_EXTSIZE;
639+
flags |= FS_XFLAG_EXTSIZE;
640640
if (di_flags & XFS_DIFLAG_EXTSZINHERIT)
641-
flags |= XFS_XFLAG_EXTSZINHERIT;
641+
flags |= FS_XFLAG_EXTSZINHERIT;
642642
if (di_flags & XFS_DIFLAG_NODEFRAG)
643-
flags |= XFS_XFLAG_NODEFRAG;
643+
flags |= FS_XFLAG_NODEFRAG;
644644
if (di_flags & XFS_DIFLAG_FILESTREAM)
645-
flags |= XFS_XFLAG_FILESTREAM;
645+
flags |= FS_XFLAG_FILESTREAM;
646646
}
647647

648648
return flags;
@@ -655,15 +655,15 @@ xfs_ip2xflags(
655655
xfs_icdinode_t *dic = &ip->i_d;
656656

657657
return _xfs_dic2xflags(dic->di_flags) |
658-
(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
658+
(XFS_IFORK_Q(ip) ? FS_XFLAG_HASATTR : 0);
659659
}
660660

661661
uint
662662
xfs_dic2xflags(
663663
xfs_dinode_t *dip)
664664
{
665665
return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
666-
(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
666+
(XFS_DFORK_Q(dip) ? FS_XFLAG_HASATTR : 0);
667667
}
668668

669669
/*

‎fs/xfs/xfs_ioctl.c

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -859,25 +859,25 @@ xfs_merge_ioc_xflags(
859859
unsigned int xflags = start;
860860

861861
if (flags & FS_IMMUTABLE_FL)
862-
xflags |= XFS_XFLAG_IMMUTABLE;
862+
xflags |= FS_XFLAG_IMMUTABLE;
863863
else
864-
xflags &= ~XFS_XFLAG_IMMUTABLE;
864+
xflags &= ~FS_XFLAG_IMMUTABLE;
865865
if (flags & FS_APPEND_FL)
866-
xflags |= XFS_XFLAG_APPEND;
866+
xflags |= FS_XFLAG_APPEND;
867867
else
868-
xflags &= ~XFS_XFLAG_APPEND;
868+
xflags &= ~FS_XFLAG_APPEND;
869869
if (flags & FS_SYNC_FL)
870-
xflags |= XFS_XFLAG_SYNC;
870+
xflags |= FS_XFLAG_SYNC;
871871
else
872-
xflags &= ~XFS_XFLAG_SYNC;
872+
xflags &= ~FS_XFLAG_SYNC;
873873
if (flags & FS_NOATIME_FL)
874-
xflags |= XFS_XFLAG_NOATIME;
874+
xflags |= FS_XFLAG_NOATIME;
875875
else
876-
xflags &= ~XFS_XFLAG_NOATIME;
876+
xflags &= ~FS_XFLAG_NOATIME;
877877
if (flags & FS_NODUMP_FL)
878-
xflags |= XFS_XFLAG_NODUMP;
878+
xflags |= FS_XFLAG_NODUMP;
879879
else
880-
xflags &= ~XFS_XFLAG_NODUMP;
880+
xflags &= ~FS_XFLAG_NODUMP;
881881

882882
return xflags;
883883
}
@@ -948,33 +948,33 @@ xfs_set_diflags(
948948

949949
/* can't set PREALLOC this way, just preserve it */
950950
di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
951-
if (xflags & XFS_XFLAG_IMMUTABLE)
951+
if (xflags & FS_XFLAG_IMMUTABLE)
952952
di_flags |= XFS_DIFLAG_IMMUTABLE;
953-
if (xflags & XFS_XFLAG_APPEND)
953+
if (xflags & FS_XFLAG_APPEND)
954954
di_flags |= XFS_DIFLAG_APPEND;
955-
if (xflags & XFS_XFLAG_SYNC)
955+
if (xflags & FS_XFLAG_SYNC)
956956
di_flags |= XFS_DIFLAG_SYNC;
957-
if (xflags & XFS_XFLAG_NOATIME)
957+
if (xflags & FS_XFLAG_NOATIME)
958958
di_flags |= XFS_DIFLAG_NOATIME;
959-
if (xflags & XFS_XFLAG_NODUMP)
959+
if (xflags & FS_XFLAG_NODUMP)
960960
di_flags |= XFS_DIFLAG_NODUMP;
961-
if (xflags & XFS_XFLAG_NODEFRAG)
961+
if (xflags & FS_XFLAG_NODEFRAG)
962962
di_flags |= XFS_DIFLAG_NODEFRAG;
963-
if (xflags & XFS_XFLAG_FILESTREAM)
963+
if (xflags & FS_XFLAG_FILESTREAM)
964964
di_flags |= XFS_DIFLAG_FILESTREAM;
965965
if (S_ISDIR(ip->i_d.di_mode)) {
966-
if (xflags & XFS_XFLAG_RTINHERIT)
966+
if (xflags & FS_XFLAG_RTINHERIT)
967967
di_flags |= XFS_DIFLAG_RTINHERIT;
968-
if (xflags & XFS_XFLAG_NOSYMLINKS)
968+
if (xflags & FS_XFLAG_NOSYMLINKS)
969969
di_flags |= XFS_DIFLAG_NOSYMLINKS;
970-
if (xflags & XFS_XFLAG_EXTSZINHERIT)
970+
if (xflags & FS_XFLAG_EXTSZINHERIT)
971971
di_flags |= XFS_DIFLAG_EXTSZINHERIT;
972-
if (xflags & XFS_XFLAG_PROJINHERIT)
972+
if (xflags & FS_XFLAG_PROJINHERIT)
973973
di_flags |= XFS_DIFLAG_PROJINHERIT;
974974
} else if (S_ISREG(ip->i_d.di_mode)) {
975-
if (xflags & XFS_XFLAG_REALTIME)
975+
if (xflags & FS_XFLAG_REALTIME)
976976
di_flags |= XFS_DIFLAG_REALTIME;
977-
if (xflags & XFS_XFLAG_EXTSIZE)
977+
if (xflags & FS_XFLAG_EXTSIZE)
978978
di_flags |= XFS_DIFLAG_EXTSIZE;
979979
}
980980

@@ -988,19 +988,19 @@ xfs_diflags_to_linux(
988988
struct inode *inode = VFS_I(ip);
989989
unsigned int xflags = xfs_ip2xflags(ip);
990990

991-
if (xflags & XFS_XFLAG_IMMUTABLE)
991+
if (xflags & FS_XFLAG_IMMUTABLE)
992992
inode->i_flags |= S_IMMUTABLE;
993993
else
994994
inode->i_flags &= ~S_IMMUTABLE;
995-
if (xflags & XFS_XFLAG_APPEND)
995+
if (xflags & FS_XFLAG_APPEND)
996996
inode->i_flags |= S_APPEND;
997997
else
998998
inode->i_flags &= ~S_APPEND;
999-
if (xflags & XFS_XFLAG_SYNC)
999+
if (xflags & FS_XFLAG_SYNC)
10001000
inode->i_flags |= S_SYNC;
10011001
else
10021002
inode->i_flags &= ~S_SYNC;
1003-
if (xflags & XFS_XFLAG_NOATIME)
1003+
if (xflags & FS_XFLAG_NOATIME)
10041004
inode->i_flags |= S_NOATIME;
10051005
else
10061006
inode->i_flags &= ~S_NOATIME;
@@ -1016,11 +1016,11 @@ xfs_ioctl_setattr_xflags(
10161016

10171017
/* Can't change realtime flag if any extents are allocated. */
10181018
if ((ip->i_d.di_nextents || ip->i_delayed_blks) &&
1019-
XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & XFS_XFLAG_REALTIME))
1019+
XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME))
10201020
return -EINVAL;
10211021

10221022
/* If realtime flag is set then must have realtime device */
1023-
if (fa->fsx_xflags & XFS_XFLAG_REALTIME) {
1023+
if (fa->fsx_xflags & FS_XFLAG_REALTIME) {
10241024
if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 ||
10251025
(ip->i_d.di_extsize % mp->m_sb.sb_rextsize))
10261026
return -EINVAL;
@@ -1031,7 +1031,7 @@ xfs_ioctl_setattr_xflags(
10311031
* we have appropriate permission.
10321032
*/
10331033
if (((ip->i_d.di_flags & (XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND)) ||
1034-
(fa->fsx_xflags & (XFS_XFLAG_IMMUTABLE | XFS_XFLAG_APPEND))) &&
1034+
(fa->fsx_xflags & (FS_XFLAG_IMMUTABLE | FS_XFLAG_APPEND))) &&
10351035
!capable(CAP_LINUX_IMMUTABLE))
10361036
return -EPERM;
10371037

@@ -1095,8 +1095,8 @@ xfs_ioctl_setattr_get_trans(
10951095
* extent size hint validation is somewhat cumbersome. Rules are:
10961096
*
10971097
* 1. extent size hint is only valid for directories and regular files
1098-
* 2. XFS_XFLAG_EXTSIZE is only valid for regular files
1099-
* 3. XFS_XFLAG_EXTSZINHERIT is only valid for directories.
1098+
* 2. FS_XFLAG_EXTSIZE is only valid for regular files
1099+
* 3. FS_XFLAG_EXTSZINHERIT is only valid for directories.
11001100
* 4. can only be changed on regular files if no extents are allocated
11011101
* 5. can be changed on directories at any time
11021102
* 6. extsize hint of 0 turns off hints, clears inode flags.
@@ -1112,10 +1112,10 @@ xfs_ioctl_setattr_check_extsize(
11121112
{
11131113
struct xfs_mount *mp = ip->i_mount;
11141114

1115-
if ((fa->fsx_xflags & XFS_XFLAG_EXTSIZE) && !S_ISREG(ip->i_d.di_mode))
1115+
if ((fa->fsx_xflags & FS_XFLAG_EXTSIZE) && !S_ISREG(ip->i_d.di_mode))
11161116
return -EINVAL;
11171117

1118-
if ((fa->fsx_xflags & XFS_XFLAG_EXTSZINHERIT) &&
1118+
if ((fa->fsx_xflags & FS_XFLAG_EXTSZINHERIT) &&
11191119
!S_ISDIR(ip->i_d.di_mode))
11201120
return -EINVAL;
11211121

@@ -1132,7 +1132,7 @@ xfs_ioctl_setattr_check_extsize(
11321132
return -EINVAL;
11331133

11341134
if (XFS_IS_REALTIME_INODE(ip) ||
1135-
(fa->fsx_xflags & XFS_XFLAG_REALTIME)) {
1135+
(fa->fsx_xflags & FS_XFLAG_REALTIME)) {
11361136
size = mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog;
11371137
} else {
11381138
size = mp->m_sb.sb_blocksize;
@@ -1143,7 +1143,7 @@ xfs_ioctl_setattr_check_extsize(
11431143
if (fa->fsx_extsize % size)
11441144
return -EINVAL;
11451145
} else
1146-
fa->fsx_xflags &= ~(XFS_XFLAG_EXTSIZE | XFS_XFLAG_EXTSZINHERIT);
1146+
fa->fsx_xflags &= ~(FS_XFLAG_EXTSIZE | FS_XFLAG_EXTSZINHERIT);
11471147

11481148
return 0;
11491149
}
@@ -1168,7 +1168,7 @@ xfs_ioctl_setattr_check_projid(
11681168

11691169
if (xfs_get_projid(ip) != fa->fsx_projid)
11701170
return -EINVAL;
1171-
if ((fa->fsx_xflags & XFS_XFLAG_PROJINHERIT) !=
1171+
if ((fa->fsx_xflags & FS_XFLAG_PROJINHERIT) !=
11721172
(ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT))
11731173
return -EINVAL;
11741174

0 commit comments

Comments
 (0)