2014-10-22 19:53:13

by Anna Schumaker

Subject: [PATCH v2] NFS: SEEK is an NFS v4.2 feature

Somehow the nfs_v4_1_minor_ops had the NFS_CAP_SEEK flag set, enabling
SEEK over v4.1. This is wrong, and can make servers crash.

Signed-off-by: Anna Schumaker <[email protected]>
---
v2: Fix compile error

fs/nfs/nfs4proc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 405bd95..8aba549 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8408,8 +8408,7 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {
| NFS_CAP_CHANGE_ATTR
| NFS_CAP_POSIX_LOCK
| NFS_CAP_STATEID_NFSV41
- | NFS_CAP_ATOMIC_OPEN_V1
- | NFS_CAP_SEEK,
+ | NFS_CAP_ATOMIC_OPEN_V1,
.init_client = nfs41_init_client,
.shutdown_client = nfs41_shutdown_client,
.match_stateid = nfs41_match_stateid,
@@ -8431,7 +8430,8 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = {
| NFS_CAP_CHANGE_ATTR
| NFS_CAP_POSIX_LOCK
| NFS_CAP_STATEID_NFSV41
- | NFS_CAP_ATOMIC_OPEN_V1,
+ | NFS_CAP_ATOMIC_OPEN_V1
+ | NFS_CAP_SEEK,
.init_client = nfs41_init_client,
.shutdown_client = nfs41_shutdown_client,
.match_stateid = nfs41_match_stateid,
--
2.1.2

2014-10-23 17:34:41

by J. Bruce Fields

Subject: Re: [PATCH v2] NFS: SEEK is an NFS v4.2 feature

On Wed, Oct 22, 2014 at 03:53:10PM -0400, Anna Schumaker wrote:
> Somehow the nfs_v4_1_minor_ops had the NFS_CAP_SEEK flag set, enabling
> SEEK over v4.1. This is wrong, and can make servers crash.
>
> Signed-off-by: Anna Schumaker <[email protected]>

Thanks!

Tested-by: J. Bruce Fields <[email protected]>

--b.

> ---
> v2: Fix compile error
>
> fs/nfs/nfs4proc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 405bd95..8aba549 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -8408,8 +8408,7 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {
> | NFS_CAP_CHANGE_ATTR
> | NFS_CAP_POSIX_LOCK
> | NFS_CAP_STATEID_NFSV41
> - | NFS_CAP_ATOMIC_OPEN_V1
> - | NFS_CAP_SEEK,
> + | NFS_CAP_ATOMIC_OPEN_V1,
> .init_client = nfs41_init_client,
> .shutdown_client = nfs41_shutdown_client,
> .match_stateid = nfs41_match_stateid,
> @@ -8431,7 +8430,8 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = {
> | NFS_CAP_CHANGE_ATTR
> | NFS_CAP_POSIX_LOCK
> | NFS_CAP_STATEID_NFSV41
> - | NFS_CAP_ATOMIC_OPEN_V1,
> + | NFS_CAP_ATOMIC_OPEN_V1
> + | NFS_CAP_SEEK,
> .init_client = nfs41_init_client,
> .shutdown_client = nfs41_shutdown_client,
> .match_stateid = nfs41_match_stateid,
> --
> 2.1.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html