diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 16:18:17 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 16:18:17 +0300 |
| commit | b740e76936c14354a9c5676a3eed839ea8472c41 (patch) | |
| tree | dd0b74f64007dba28fcf12595af893e367d307ff /fs/nfs/namespace.c | |
| parent | 7141fd3e5ba90d09d2138ff1bbefd7cc43a82e94 (diff) | |
| parent | 6d61e70ccc21606ffb8a0a03bd3aba24f659502b (diff) | |
| download | linux-b740e76936c14354a9c5676a3eed839ea8472c41.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Required for Daniel's drm_vblank_cleanup cleanup
Diffstat (limited to 'fs/nfs/namespace.c')
| -rw-r--r-- | fs/nfs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 1a224a33a6c2..e5686be67be8 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -246,7 +246,7 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, devname = nfs_devname(dentry, page, PAGE_SIZE); if (IS_ERR(devname)) - mnt = (struct vfsmount *)devname; + mnt = ERR_CAST(devname); else mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata); |