diff options
Diffstat (limited to 'fs/autofs4/root.c')
-rw-r--r-- | fs/autofs4/root.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index dbb5b7212ce1..7e44fdd03e2d 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
@@ -108,7 +108,7 @@ static int autofs4_dir_open(struct inode *inode, struct file *file) | |||
108 | struct dentry *dentry = file->f_path.dentry; | 108 | struct dentry *dentry = file->f_path.dentry; |
109 | struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb); | 109 | struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb); |
110 | 110 | ||
111 | DPRINTK("file=%p dentry=%p %pD", file, dentry, dentry); | 111 | DPRINTK("file=%p dentry=%p %pd", file, dentry, dentry); |
112 | 112 | ||
113 | if (autofs4_oz_mode(sbi)) | 113 | if (autofs4_oz_mode(sbi)) |
114 | goto out; | 114 | goto out; |
@@ -371,7 +371,7 @@ static struct vfsmount *autofs4_d_automount(struct path *path) | |||
371 | * having d_mountpoint() true, so there's no need to call back | 371 | * having d_mountpoint() true, so there's no need to call back |
372 | * to the daemon. | 372 | * to the daemon. |
373 | */ | 373 | */ |
374 | if (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode)) { | 374 | if (dentry->d_inode && d_is_symlink(dentry)) { |
375 | spin_unlock(&sbi->fs_lock); | 375 | spin_unlock(&sbi->fs_lock); |
376 | goto done; | 376 | goto done; |
377 | } | 377 | } |
@@ -485,7 +485,7 @@ static int autofs4_d_manage(struct dentry *dentry, bool rcu_walk) | |||
485 | * an incorrect ELOOP error return. | 485 | * an incorrect ELOOP error return. |
486 | */ | 486 | */ |
487 | if ((!d_mountpoint(dentry) && !simple_empty(dentry)) || | 487 | if ((!d_mountpoint(dentry) && !simple_empty(dentry)) || |
488 | (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode))) | 488 | (dentry->d_inode && d_is_symlink(dentry))) |
489 | status = -EISDIR; | 489 | status = -EISDIR; |
490 | } | 490 | } |
491 | spin_unlock(&sbi->fs_lock); | 491 | spin_unlock(&sbi->fs_lock); |