diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 13:28:15 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 13:28:15 -0400 |
| commit | cc85906110e26fe8537c3bdbc08a74ae8110030b (patch) | |
| tree | 891813098ede3dba4d5ff3b83b1f7b491367ad2f /fs/nfs/getroot.c | |
| parent | c09bca786ff941ed17c5f381c4eca5b106808c51 (diff) | |
| parent | c69da774b28e01e062e0a3aba7509f2dcfd2a11a (diff) | |
| download | kernel_samsung_espresso10-cc85906110e26fe8537c3bdbc08a74ae8110030b.zip kernel_samsung_espresso10-cc85906110e26fe8537c3bdbc08a74ae8110030b.tar.gz kernel_samsung_espresso10-cc85906110e26fe8537c3bdbc08a74ae8110030b.tar.bz2 | |
Merge branch 'devel' into for-linus
Diffstat (limited to 'fs/nfs/getroot.c')
| -rw-r--r-- | fs/nfs/getroot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index b7c9b2d..46177cb 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c @@ -156,7 +156,7 @@ int nfs4_path_walk(struct nfs_server *server, return ret; } - if (fattr.type != NFDIR) { + if (!S_ISDIR(fattr.mode)) { printk(KERN_ERR "nfs4_get_root:" " getroot encountered non-directory\n"); return -ENOTDIR; @@ -213,7 +213,7 @@ eat_dot_dir: return ret; } - if (fattr.type != NFDIR) { + if (!S_ISDIR(fattr.mode)) { printk(KERN_ERR "nfs4_get_root:" " lookupfh encountered non-directory\n"); return -ENOTDIR; |