Commit e69a333b5e0c8c6b687b07665a3cb5545657d2aa
1 parent
7e9c639615
Exists in
master
and in
7 other branches
[XFS] Add in grpid/nogrpid mount option parsing, actual code was always
there.. SGI-PV: 939444 SGI-Modid: xfs-linux:xfs-kern:23162a Signed-off-by: Nathan Scott <nathans@sgi.com>
Showing 1 changed file with 15 additions and 1 deletions Side-by-side Diff
fs/xfs/xfs_vfsops.c
| ... | ... | @@ -1621,6 +1621,10 @@ |
| 1621 | 1621 | #define MNTOPT_SWIDTH "swidth" /* data volume stripe width */ |
| 1622 | 1622 | #define MNTOPT_NOUUID "nouuid" /* ignore filesystem UUID */ |
| 1623 | 1623 | #define MNTOPT_MTPT "mtpt" /* filesystem mount point */ |
| 1624 | +#define MNTOPT_GRPID "grpid" /* group-ID from parent directory */ | |
| 1625 | +#define MNTOPT_NOGRPID "nogrpid" /* group-ID from current process */ | |
| 1626 | +#define MNTOPT_BSDGROUPS "bsdgroups" /* group-ID from parent directory */ | |
| 1627 | +#define MNTOPT_SYSVGROUPS "sysvgroups" /* group-ID from current process */ | |
| 1624 | 1628 | #define MNTOPT_ALLOCSIZE "allocsize" /* preferred allocation size */ |
| 1625 | 1629 | #define MNTOPT_IHASHSIZE "ihashsize" /* size of inode hash table */ |
| 1626 | 1630 | #define MNTOPT_NORECOVERY "norecovery" /* don't run XFS recovery */ |
| ... | ... | @@ -1741,6 +1745,12 @@ |
| 1741 | 1745 | } |
| 1742 | 1746 | args->flags |= XFSMNT_IHASHSIZE; |
| 1743 | 1747 | args->ihashsize = simple_strtoul(value, &eov, 10); |
| 1748 | + } else if (!strcmp(this_char, MNTOPT_GRPID) || | |
| 1749 | + !strcmp(this_char, MNTOPT_BSDGROUPS)) { | |
| 1750 | + vfsp->vfs_flag |= VFS_GRPID; | |
| 1751 | + } else if (!strcmp(this_char, MNTOPT_NOGRPID) || | |
| 1752 | + !strcmp(this_char, MNTOPT_SYSVGROUPS)) { | |
| 1753 | + vfsp->vfs_flag &= ~VFS_GRPID; | |
| 1744 | 1754 | } else if (!strcmp(this_char, MNTOPT_WSYNC)) { |
| 1745 | 1755 | args->flags |= XFSMNT_WSYNC; |
| 1746 | 1756 | } else if (!strcmp(this_char, MNTOPT_OSYNCISOSYNC)) { |
| ... | ... | @@ -1862,6 +1872,7 @@ |
| 1862 | 1872 | }; |
| 1863 | 1873 | struct proc_xfs_info *xfs_infop; |
| 1864 | 1874 | struct xfs_mount *mp = XFS_BHVTOM(bhv); |
| 1875 | + struct vfs *vfsp = XFS_MTOVFS(mp); | |
| 1865 | 1876 | |
| 1866 | 1877 | for (xfs_infop = xfs_info; xfs_infop->flag; xfs_infop++) { |
| 1867 | 1878 | if (mp->m_flags & xfs_infop->flag) |
| ... | ... | @@ -1898,7 +1909,10 @@ |
| 1898 | 1909 | |
| 1899 | 1910 | if (!(mp->m_flags & XFS_MOUNT_32BITINOOPT)) |
| 1900 | 1911 | seq_printf(m, "," MNTOPT_64BITINODE); |
| 1901 | - | |
| 1912 | + | |
| 1913 | + if (vfsp->vfs_flag & VFS_GRPID) | |
| 1914 | + seq_printf(m, "," MNTOPT_GRPID); | |
| 1915 | + | |
| 1902 | 1916 | return 0; |
| 1903 | 1917 | } |
| 1904 | 1918 |