nfs4 use mandatory attribute file type in nfs4_get_root
Subsystems (2)
PATCH 1/1 nfs4 use mandatory attribute file type in nfs4_get_root
From: Andy Adamson <[email protected]>
decode_attr_type sets fattr->mode.
--- fs/nfs/getroot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/nfs/getroot.c +1 -1
@@ -146,7 +146,7 @@ int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh) goto out; } -if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_MODE ) +if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_TYPE ) || !S_ISDIR (fsinfo.fattr->mode)) {printk (KERN_ERR "nfs4_get_rootfh:" " getroot encountered non-directory\n" );
Signature · 1 line
1.6.6
Quoted 3 lines · On Thu, 2010-06-10 at 16:52 -0400, [email protected] wrote:
From: Andy Adamson <[email protected]>
decode_attr_typesetsfattr->mode.
Well, yes... It sets part of fattr->mode. More specifically, though, it sets the file type part, so your patch is correct.
I'll fix up the above changelog entry so that it is a bit more descriptive. How about the following?
S_ISDIR(fsinfo.fattr->mode) checks the file type rather than the mode bits, so we should be checking for the NFS_ATTR_FATTR_TYPE fattr property.
Quoted 19 lines
Signed-off-by Andy Adamson <[email protected]>--- fs/nfs/getroot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/nfs/getroot.c +1
-1@@ -146,7 +146,7 @@ int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh) goto out; } -if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_MODE ) +if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_TYPE ) || !S_ISDIR (fsinfo.fattr->mode)) {printk (KERN_ERR "nfs4_get_rootfh:" " getroot encountered non-directory\n" );
A message that is not in the archive (sent off-list or not yet received): 1276552926.3953.8.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org
Quoted 8 lines · Trond Myklebust
Quoted 3 lines · On Thu, 2010-06-10 at 16:52 -0400, [email protected] wrote:
From: Andy Adamson <[email protected]>
decode_attr_typesetsfattr->mode.Well, yes... It sets part of
fattr->mode. More specifically, though, it sets the file type part, so your patch is correct.
Quoted 6 lines
I'll fix up the above changelog entry so that it is a bit more descriptive. How about the following?
S_ISDIR(fsinfo.fattr->mode)checks the file type rather than the mode bits, so we should be checking for theNFS_ATTR_FATTR_TYPEfattr property.
Looks good.
-->Andy
Quoted 27 lines
Quoted 12 lines
Signed-off-by Andy Adamson <[email protected]>--- fs/nfs/getroot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/nfs/getroot.c +0
-0fs/nfs/getroot.c int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh) · line 152
Quoted 8 lines
fs/nfs/getroot.c +1
-1@@ -146,7 +146,7 @@ int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh) goto out; } -if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_MODE ) +if (!(fsinfo.fattr->valid &NFS_ATTR_FATTR_TYPE ) || !S_ISDIR (fsinfo.fattr->mode)) {printk (KERN_ERR "nfs4_get_rootfh:" " getroot encountered non-directory\n" );--
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