diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2016-12-09 16:45:04 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-12-09 16:45:04 +0100 |
| commit | fd4a0edf2a3d781c6ae07d2810776ce22302ee1c (patch) | |
| tree | 4ccfd06bc5705bc2903667043e4f9fdadb568d1b /fs/nfsd/vfs.c | |
| parent | 2a07a1f5abba308729bd082dce4d035365165d85 (diff) | |
| download | op-kernel-dev-fd4a0edf2a3d781c6ae07d2810776ce22302ee1c.zip op-kernel-dev-fd4a0edf2a3d781c6ae07d2810776ce22302ee1c.tar.gz | |
vfs: replace calling i_op->readlink with vfs_readlink()
Also check d_is_symlink() in callers instead of inode->i_op->readlink
because following patches will allow NULL ->readlink for symlinks.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 8ca642f..b854f02 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1451,7 +1451,6 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, __be32 nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) { - struct inode *inode; mm_segment_t oldfs; __be32 err; int host_err; @@ -1463,10 +1462,9 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) path.mnt = fhp->fh_export->ex_path.mnt; path.dentry = fhp->fh_dentry; - inode = d_inode(path.dentry); err = nfserr_inval; - if (!inode->i_op->readlink) + if (!d_is_symlink(path.dentry)) goto out; touch_atime(&path); @@ -1475,7 +1473,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) */ oldfs = get_fs(); set_fs(KERNEL_DS); - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp); + host_err = vfs_readlink(path.dentry, (char __user *)buf, *lenp); set_fs(oldfs); if (host_err < 0) |
