patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / fs / nfsd / nfsfh.c

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 369ccea..8e8c234 100644 (file)
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -56,7 +56,7 @@ int nfsd_acceptable(void *expv, struct dentry *dentry)
                /* make sure parents give x permission to user */
                int err;
                parent = dget_parent(tdentry);
-               err = permission(parent->d_inode, S_IXOTH, NULL);
+               err = permission(parent->d_inode, MAY_EXEC, NULL);
                if (err < 0) {
                        dput(parent);
                        break;
@@ -367,7 +367,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st
                printk(KERN_ERR "fh_compose: called with maxsize %d! %s/%s\n",
                       fhp->fh_maxsize, parent->d_name.name, dentry->d_name.name);
 
-       fhp->fh_dentry = dentry; /* our internal copy */
+       fhp->fh_dentry = dget(dentry); /* our internal copy */
        fhp->fh_export = exp;
        cache_get(&exp->h);