Attachment 155804 Details for Bug 209964 – Updated upstream patch 2, much the same as the upstream version

[patch] Updated upstream patch 2, much the same as the upstream version

nfs-rhel5-2.6.18-error-on-same-fs-with-different-options.patch (text/plain), 1.82 KB, created by Ian Kent on 2007-05-31 12:54:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-05-31 12:54:11 UTC

Size: 1.82 KB

patch

obsolete

>--- linux-2.6.18.noarch/fs/nfs/super.c.error-on-same-fs-with-different-options	2007-05-28 12:16:04.000000000 +0800
>+++ linux-2.6.18.noarch/fs/nfs/super.c	2007-05-28 12:16:33.000000000 +0800
>@@ -599,7 +599,9 @@ static int nfs_compare_super(struct supe
> {
> 	struct nfs_server *server = data, *old = NFS_SB(sb);
> 
>-	if (old->nfs_client != server->nfs_client)
>+	if (memcmp(&old->nfs_client->cl_addr,
>+				&server->nfs_client->cl_addr,
>+				sizeof(old->nfs_client->cl_addr)) != 0)
> 		return 0;
> 	/* Note: NFS_MOUNT_UNSHARED == NFS4_MOUNT_UNSHARED */
> 	if (old->flags & NFS_MOUNT_UNSHARED)
>@@ -626,6 +628,29 @@ static int nfs_validate_shared_option(st
> 	return error;
> }
> 
>+static int nfs_compare_mount_options(const struct nfs_server *a, const struct nfs_server *b)
>+{
>+	if (a->nfs_client != b->nfs_client)
>+		goto Ebusy;
>+	if (a->flags != b->flags)
>+		goto Ebusy;
>+	if (a->wsize != b->wsize)
>+		goto Ebusy;
>+	if (a->rsize != b->rsize)
>+		goto Ebusy;
>+	if (a->acregmin != b->acregmin)
>+		goto Ebusy;
>+	if (a->acregmax != b->acregmax)
>+		goto Ebusy;
>+	if (a->acdirmin != b->acdirmin)
>+		goto Ebusy;
>+	if (a->acdirmax != b->acdirmax)
>+		goto Ebusy;
>+	return 0;
>+Ebusy:
>+	return -EBUSY;
>+}
>+
> static int nfs_get_sb(struct file_system_type *fs_type,
> 	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)
> {
>@@ -665,8 +690,11 @@ static int nfs_get_sb(struct file_system
> 	}
> 
> 	if (s->s_fs_info != server) {
>+		error = nfs_compare_mount_options(server, NFS_SB(s));
> 		nfs_free_server(server);
> 		server = NULL;
>+		if (error < 0)
>+			goto error_splat_super;
> 	}
> 
> 	if (!s->s_root) {
>@@ -930,8 +958,11 @@ static int nfs4_get_sb(struct file_syste
> 	}
> 
> 	if (s->s_fs_info != server) {
>+		error = nfs_compare_mount_options(server, NFS_SB(s));
> 		nfs_free_server(server);
> 		server = NULL;
>+		if (error < 0)
>+			goto error_splat_super;
> 	}
> 
> 	if (!s->s_root) {

Actions: View | Diff

Attachments on bug 209964: 138025 | 155801 | 155802 | 155803 | 155804