diff --git a/[refs] b/[refs] index 5927866e83d2..2d6baee51697 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b86acd501a34227e0ed2b2d54dc8002c1701ce17 +refs/heads/master: d3db90e270791b21cd00d3c094884bffa907cc9e diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 9b496ef4abea..084e8cb41c84 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1476,14 +1476,10 @@ dentry->d_parent->d_name.name, dentry->d_name.name); error = NFS_PROTO(dir)->symlink(dir, &dentry->d_name, &qsymname, &attr, &sym_fh, &sym_attr); nfs_end_data_update(dir); - if (!error) { + if (!error) error = nfs_instantiate(dentry, &sym_fh, &sym_attr); - } else { - if (error == -EEXIST) - printk("nfs_proc_symlink: %s/%s already exists??\n", - dentry->d_parent->d_name.name, dentry->d_name.name); + else d_drop(dentry); - } unlock_kernel(); return error; }