Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126359
b: refs/heads/master
c: 41cfef2
h: refs/heads/master
i:
  126357: 98c13b6
  126355: 708ed86
  126351: 84e4df2
v: v3
  • Loading branch information
Ian Kent authored and Linus Torvalds committed Jan 6, 2009
1 parent 988a364 commit 546ebe2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 730c9eeca9808fc2cfb506cc68c90aa330da17b0
refs/heads/master: 41cfef2eb87694a8d64105c059b39f7bd6b7d4fe
6 changes: 3 additions & 3 deletions trunk/fs/autofs4/dev-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 546ebe2

Please sign in to comment.