Fix mount flags checking order.
trunk/akari/permission.c (diff)| @@ -1896,31 +1896,25 @@ | ||
| 1896 | 1896 | if (flags & MS_REMOUNT) { |
| 1897 | 1897 | type = ccs_mounts[CCS_MOUNT_REMOUNT]; |
| 1898 | 1898 | flags &= ~MS_REMOUNT; |
| 1899 | - } | |
| 1900 | - if (flags & MS_MOVE) { | |
| 1901 | - type = ccs_mounts[CCS_MOUNT_MOVE]; | |
| 1902 | - flags &= ~MS_MOVE; | |
| 1903 | - } | |
| 1904 | - if (flags & MS_BIND) { | |
| 1899 | + } else if (flags & MS_BIND) { | |
| 1905 | 1900 | type = ccs_mounts[CCS_MOUNT_BIND]; |
| 1906 | 1901 | flags &= ~MS_BIND; |
| 1907 | - } | |
| 1908 | - if (flags & MS_UNBINDABLE) { | |
| 1909 | - type = ccs_mounts[CCS_MOUNT_MAKE_UNBINDABLE]; | |
| 1910 | - flags &= ~MS_UNBINDABLE; | |
| 1911 | - } | |
| 1912 | - if (flags & MS_PRIVATE) { | |
| 1902 | + } else if (flags & MS_SHARED) { | |
| 1903 | + type = ccs_mounts[CCS_MOUNT_MAKE_SHARED]; | |
| 1904 | + flags &= ~MS_SHARED; | |
| 1905 | + } else if (flags & MS_PRIVATE) { | |
| 1913 | 1906 | type = ccs_mounts[CCS_MOUNT_MAKE_PRIVATE]; |
| 1914 | 1907 | flags &= ~MS_PRIVATE; |
| 1915 | - } | |
| 1916 | - if (flags & MS_SLAVE) { | |
| 1908 | + } else if (flags & MS_SLAVE) { | |
| 1917 | 1909 | type = ccs_mounts[CCS_MOUNT_MAKE_SLAVE]; |
| 1918 | 1910 | flags &= ~MS_SLAVE; |
| 1911 | + } else if (flags & MS_UNBINDABLE) { | |
| 1912 | + type = ccs_mounts[CCS_MOUNT_MAKE_UNBINDABLE]; | |
| 1913 | + flags &= ~MS_UNBINDABLE; | |
| 1914 | + } else if (flags & MS_MOVE) { | |
| 1915 | + type = ccs_mounts[CCS_MOUNT_MOVE]; | |
| 1916 | + flags &= ~MS_MOVE; | |
| 1919 | 1917 | } |
| 1920 | - if (flags & MS_SHARED) { | |
| 1921 | - type = ccs_mounts[CCS_MOUNT_MAKE_SHARED]; | |
| 1922 | - flags &= ~MS_SHARED; | |
| 1923 | - } | |
| 1924 | 1918 | if (!type) |
| 1925 | 1919 | type = "<NULL>"; |
| 1926 | 1920 | idx = ccs_read_lock(); |