From 546ebe2312ac1e88513e47afa5d8a8390b4a6e9d Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Tue, 6 Jan 2009 14:42:07 -0800
Subject: [PATCH] --- yaml --- r: 126359 b: refs/heads/master c:
 41cfef2eb87694a8d64105c059b39f7bd6b7d4fe h: refs/heads/master i:   126357:
 98c13b641b7e1cdd319e389777ec7fe9c78b589b   126355:
 708ed86a778c6018ce1f7aceefd41c9fa19d665e   126351:
 84e4df2f07ff9d4079667aee83127a36a9c10b56 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/autofs4/dev-ioctl.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 22a319c99a06..49d84e25bd37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 730c9eeca9808fc2cfb506cc68c90aa330da17b0
+refs/heads/master: 41cfef2eb87694a8d64105c059b39f7bd6b7d4fe
diff --git a/trunk/fs/autofs4/dev-ioctl.c b/trunk/fs/autofs4/dev-ioctl.c
index 054d6d9ad9ba..0566ff8db4cd 100644
--- a/trunk/fs/autofs4/dev-ioctl.c
+++ b/trunk/fs/autofs4/dev-ioctl.c
@@ -646,17 +646,17 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
 			magic = nd.path.dentry->d_inode->i_sb->s_magic;
 		}
 	} else {
-		dev_t devid = new_encode_dev(sbi->sb->s_dev);
+		dev_t dev = autofs4_get_dev(sbi);
 
 		err = path_lookup(path, LOOKUP_PARENT, &nd);
 		if (err)
 			goto out;
 
-		err = autofs_dev_ioctl_find_super(&nd, devid);
+		err = autofs_dev_ioctl_find_super(&nd, dev);
 		if (err)
 			goto out_release;
 
-		devid = autofs4_get_dev(sbi);
+		devid = dev;
 
 		err = have_submounts(nd.path.dentry);