From patchwork Fri May 21 18:25:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/4] cifs: make cifs_lookup return a dentry From: Jeff Layton X-Patchwork-Id: 53200 Message-Id: <1274466317-28231-2-git-send-email-jlayton@redhat.com> To: linux-cifs-client@lists.samba.org Cc: linux-fsdevel@vger.kernel.org Date: Fri, 21 May 2010 14:25:14 -0400 cifs_lookup doesn't actually return a dentry. It instantiates the one that's passed in, but callers don't have any way to know if the lookup succeeded. Signed-off-by: Jeff Layton --- fs/cifs/dir.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 391816b..54de8e5 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -639,6 +639,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct inode *newInode = NULL; char *full_path = NULL; struct file *filp; + struct dentry *res; xid = GetXid(); @@ -738,7 +739,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, /* since paths are not looked up by component - the parent directories are presumed to be good here */ renew_parental_timestamps(direntry); - + res = direntry; + dget(res); } else if (rc == -ENOENT) { rc = 0; direntry->d_time = jiffies; @@ -747,17 +749,20 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, else direntry->d_op = &cifs_dentry_ops; d_add(direntry, NULL); - /* if it was once a directory (but how can we tell?) we could do - shrink_dcache_parent(direntry); */ + res = direntry; + dget(res); } else if (rc != -EACCES) { cERROR(1, "Unexpected lookup error %d", rc); /* We special case check for Access Denied - since that is a common return code */ + res = ERR_PTR(rc); + } else { + res = ERR_PTR(rc); } kfree(full_path); FreeXid(xid); - return ERR_PTR(rc); + return res; } static int