summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2010-06-16 09:51:02 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-06-22 13:17:43 -0400
commitf799bdb355edaabd81b778087613409a8932fbe9 (patch)
treee2d27df6984a11b3710fbc5ceb2dd874c375b3bb /fs
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
downloadlinux-stable-f799bdb355edaabd81b778087613409a8932fbe9.tar.gz
linux-stable-f799bdb355edaabd81b778087613409a8932fbe9.tar.bz2
linux-stable-f799bdb355edaabd81b778087613409a8932fbe9.zip
nfs4 use mandatory attribute file type in nfs4_get_root
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. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/getroot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 7428f7d6273b..a70e446e1605 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -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");