Merge remote-tracking branch 'regulator/fix/db8500' into tmp

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / nfsproc.c

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index aad6d457b9e8ef75d410d01de3dd6bac692c96fd..54c6b3d3cc79b399071a9d8c279fecb415fd5453 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -26,17 +26,13 @@ static __be32
 nfsd_return_attrs(__be32 err, struct nfsd_attrstat *resp)
 {
        if (err) return err;
-       return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt,
-                                   resp->fh.fh_dentry,
-                                   &resp->stat));
+       return fh_getattr(&resp->fh, &resp->stat);
 }
 static __be32
 nfsd_return_dirop(__be32 err, struct nfsd_diropres *resp)
 {
        if (err) return err;
-       return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt,
-                                   resp->fh.fh_dentry,
-                                   &resp->stat));
+       return fh_getattr(&resp->fh, &resp->stat);
 }
 /*
  * Get a file's attributes
@@ -150,9 +146,7 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp,
                                  &resp->count);
 
        if (nfserr) return nfserr;
-       return nfserrno(vfs_getattr(resp->fh.fh_export->ex_path.mnt,
-                                   resp->fh.fh_dentry,
-                                   &resp->stat));
+       return fh_getattr(&resp->fh, &resp->stat);
 }
 
 /*