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) | |
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 b7c9b2df1f29..46177cb87064 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c | |||
| @@ -156,7 +156,7 @@ int nfs4_path_walk(struct nfs_server *server, | |||
| 156 | return ret; | 156 | return ret; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | if (fattr.type != NFDIR) { | 159 | if (!S_ISDIR(fattr.mode)) { |
| 160 | printk(KERN_ERR "nfs4_get_root:" | 160 | printk(KERN_ERR "nfs4_get_root:" |
| 161 | " getroot encountered non-directory\n"); | 161 | " getroot encountered non-directory\n"); |
| 162 | return -ENOTDIR; | 162 | return -ENOTDIR; |
| @@ -213,7 +213,7 @@ eat_dot_dir: | |||
| 213 | return ret; | 213 | return ret; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | if (fattr.type != NFDIR) { | 216 | if (!S_ISDIR(fattr.mode)) { |
| 217 | printk(KERN_ERR "nfs4_get_root:" | 217 | printk(KERN_ERR "nfs4_get_root:" |
| 218 | " lookupfh encountered non-directory\n"); | 218 | " lookupfh encountered non-directory\n"); |
| 219 | return -ENOTDIR; | 219 | return -ENOTDIR; |