From 3e13aa2977f09d264834e534c9782a80846e8ce7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 17 Jul 2007 04:04:31 -0700 Subject: [PATCH] --- yaml --- r: 60816 b: refs/heads/master c: d7dd618a5901ce0b44ef518208b35f728775db74 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/exportfs/expfs.c | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 4eebf7ad50d0..5aeeaf28be13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f11c341da8c0ec6b8b024e892108a6537ba8c4 +refs/heads/master: d7dd618a5901ce0b44ef518208b35f728775db74 diff --git a/trunk/fs/exportfs/expfs.c b/trunk/fs/exportfs/expfs.c index 1e6f556514d6..abf0a316aa1a 100644 --- a/trunk/fs/exportfs/expfs.c +++ b/trunk/fs/exportfs/expfs.c @@ -116,30 +116,23 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent, if (IS_ERR(result)) return result; - if (S_ISDIR(result->d_inode->i_mode) && - (result->d_flags & DCACHE_DISCONNECTED)) { - /* it is an unconnected directory, we must connect it */ - ; - } else { - if (acceptable(context, result)) - return result; - if (S_ISDIR(result->d_inode->i_mode)) { + if (S_ISDIR(result->d_inode->i_mode)) { + if (!(result->d_flags & DCACHE_DISCONNECTED)) { + if (acceptable(context, result)) + return result; err = -EACCES; goto err_result; } + target_dir = dget(result); + } else { + if (acceptable(context, result)) + return result; + alias = find_acceptable_alias(result, acceptable, context); if (alias) return alias; - } - /* It's a directory, or we are required to confirm the file's - * location in the tree based on the parent information - */ - dprintk("find_exported_dentry: need to look harder for %s/%d\n",sb->s_id,*(int*)obj); - if (S_ISDIR(result->d_inode->i_mode)) - target_dir = dget(result); - else { if (parent == NULL) goto err_result; @@ -149,6 +142,7 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent, goto err_result; } } + /* * Now we need to make sure that target_dir is properly connected. * It may already be, as the flag isn't always updated when connection