diff options
| -rw-r--r-- | fs/nfs/super.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index c08e837c29e5..e4499d5b51e8 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -2179,7 +2179,7 @@ out_no_address: | |||
| 2179 | return -EINVAL; | 2179 | return -EINVAL; |
| 2180 | } | 2180 | } |
| 2181 | 2181 | ||
| 2182 | #define NFS_MOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \ | 2182 | #define NFS_REMOUNT_CMP_FLAGMASK ~(NFS_MOUNT_INTR \ |
| 2183 | | NFS_MOUNT_SECURE \ | 2183 | | NFS_MOUNT_SECURE \ |
| 2184 | | NFS_MOUNT_TCP \ | 2184 | | NFS_MOUNT_TCP \ |
| 2185 | | NFS_MOUNT_VER3 \ | 2185 | | NFS_MOUNT_VER3 \ |
| @@ -2187,15 +2187,16 @@ out_no_address: | |||
| 2187 | | NFS_MOUNT_NONLM \ | 2187 | | NFS_MOUNT_NONLM \ |
| 2188 | | NFS_MOUNT_BROKEN_SUID \ | 2188 | | NFS_MOUNT_BROKEN_SUID \ |
| 2189 | | NFS_MOUNT_STRICTLOCK \ | 2189 | | NFS_MOUNT_STRICTLOCK \ |
| 2190 | | NFS_MOUNT_UNSHARED \ | ||
| 2191 | | NFS_MOUNT_NORESVPORT \ | ||
| 2192 | | NFS_MOUNT_LEGACY_INTERFACE) | 2190 | | NFS_MOUNT_LEGACY_INTERFACE) |
| 2193 | 2191 | ||
| 2192 | #define NFS_MOUNT_CMP_FLAGMASK (NFS_REMOUNT_CMP_FLAGMASK & \ | ||
| 2193 | ~(NFS_MOUNT_UNSHARED | NFS_MOUNT_NORESVPORT)) | ||
| 2194 | |||
| 2194 | static int | 2195 | static int |
| 2195 | nfs_compare_remount_data(struct nfs_server *nfss, | 2196 | nfs_compare_remount_data(struct nfs_server *nfss, |
| 2196 | struct nfs_parsed_mount_data *data) | 2197 | struct nfs_parsed_mount_data *data) |
| 2197 | { | 2198 | { |
| 2198 | if ((data->flags ^ nfss->flags) & NFS_MOUNT_CMP_FLAGMASK || | 2199 | if ((data->flags ^ nfss->flags) & NFS_REMOUNT_CMP_FLAGMASK || |
| 2199 | data->rsize != nfss->rsize || | 2200 | data->rsize != nfss->rsize || |
| 2200 | data->wsize != nfss->wsize || | 2201 | data->wsize != nfss->wsize || |
| 2201 | data->version != nfss->nfs_client->rpc_ops->version || | 2202 | data->version != nfss->nfs_client->rpc_ops->version || |
