Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

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,
                 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;