diff options
| author | Miklos Szeredi | 2016-12-09 16:45:04 +0100 |
|---|---|---|
| committer | Miklos Szeredi | 2016-12-09 16:45:04 +0100 |
| commit | fd4a0edf2a3d781c6ae07d2810776ce22302ee1c (patch) | |
| tree | 4ccfd06bc5705bc2903667043e4f9fdadb568d1b /fs/nfsd/nfs4xdr.c | |
| parent | proc/self: use generic_readlink (diff) | |
| download | kernel-qcow2-linux-fd4a0edf2a3d781c6ae07d2810776ce22302ee1c.tar.gz kernel-qcow2-linux-fd4a0edf2a3d781c6ae07d2810776ce22302ee1c.tar.xz kernel-qcow2-linux-fd4a0edf2a3d781c6ae07d2810776ce22302ee1c.zip | |
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/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index c2d2895a1ec1..645e1e3c3110 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3576,10 +3576,10 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd if (!p) return nfserr_resource; /* - * XXX: By default, the ->readlink() VFS op will truncate symlinks - * if they would overflow the buffer. Is this kosher in NFSv4? If - * not, one easy fix is: if ->readlink() precisely fills the buffer, - * assume that truncation occurred, and return NFS4ERR_RESOURCE. + * XXX: By default, vfs_readlink() will truncate symlinks if they + * would overflow the buffer. Is this kosher in NFSv4? If not, one + * easy fix is: if vfs_readlink() precisely fills the buffer, assume + * that truncation occurred, and return NFS4ERR_RESOURCE. */ nfserr = nfsd_readlink(readlink->rl_rqstp, readlink->rl_fhp, (char *)p, &maxcount); |