NFS: nfs_rename() handle -ERESTARTSYS dentry left behind

[sfrench/cifs-2.6.git] / fs / nfs / dir.c

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index cb22a9f9ae7e3694db1532a683ae34d4d313e787..fb499a3f21b58ed341bbe17933bd5e191c850212 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1273,8 +1273,8 @@ out_error:
  */
 static int nfs_weak_revalidate(struct dentry *dentry, unsigned int flags)
 {
-       int error;
        struct inode *inode = d_inode(dentry);
+       int error = 0;
 
        /*
         * I believe we can only get a negative dentry here in the case of a
@@ -1293,7 +1293,8 @@ static int nfs_weak_revalidate(struct dentry *dentry, unsigned int flags)
                return 0;
        }
 
-       error = nfs_revalidate_inode(NFS_SERVER(inode), inode);
+       if (nfs_mapping_need_revalidate_inode(inode))
+               error = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
        dfprintk(LOOKUPCACHE, "NFS: %s: inode %lu is %s\n",
                        __func__, inode->i_ino, error ? "invalid" : "valid");
        return !error;
@@ -2001,6 +2002,29 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(nfs_link);
 
+static void
+nfs_complete_rename(struct rpc_task *task, struct nfs_renamedata *data)
+{
+       struct dentry *old_dentry = data->old_dentry;
+       struct dentry *new_dentry = data->new_dentry;
+       struct inode *old_inode = d_inode(old_dentry);
+       struct inode *new_inode = d_inode(new_dentry);
+
+       nfs_mark_for_revalidate(old_inode);
+
+       switch (task->tk_status) {
+       case 0:
+               if (new_inode != NULL)
+                       nfs_drop_nlink(new_inode);
+               d_move(old_dentry, new_dentry);
+               nfs_set_verifier(new_dentry,
+                                       nfs_save_change_attribute(data->new_dir));
+               break;
+       case -ENOENT:
+               nfs_dentry_handle_enoent(old_dentry);
+       }
+}
+
 /*
  * RENAME
  * FIXME: Some nfsds, like the Linux user space nfsd, may generate a
@@ -2083,7 +2107,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (new_inode != NULL)
                NFS_PROTO(new_inode)->return_delegation(new_inode);
 
-       task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL);
+       task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry,
+                                       nfs_complete_rename);
        if (IS_ERR(task)) {
                error = PTR_ERR(task);
                goto out;
@@ -2093,21 +2118,11 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (error == 0)
                error = task->tk_status;
        rpc_put_task(task);
-       nfs_mark_for_revalidate(old_inode);
 out:
        if (rehash)
                d_rehash(rehash);
        trace_nfs_rename_exit(old_dir, old_dentry,
                        new_dir, new_dentry, error);
-       if (!error) {
-               if (new_inode != NULL)
-                       nfs_drop_nlink(new_inode);
-               d_move(old_dentry, new_dentry);
-               nfs_set_verifier(new_dentry,
-                                       nfs_save_change_attribute(new_dir));
-       } else if (error == -ENOENT)
-               nfs_dentry_handle_enoent(old_dentry);
-
        /* new dentry created? */
        if (dentry)
                dput(dentry);
@@ -2285,8 +2300,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
                if (cache == NULL)
                        goto out;
                /* Found an entry, is our attribute cache valid? */
-               if (!nfs_attribute_cache_expired(inode) &&
-                   !(nfsi->cache_validity & NFS_INO_INVALID_ATTR))
+               if (!nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))
                        break;
                err = -ECHILD;
                if (!may_block)
@@ -2334,12 +2348,12 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred,
                cache = NULL;
        if (cache == NULL)
                goto out;
-       err = nfs_revalidate_inode_rcu(NFS_SERVER(inode), inode);
-       if (err)
+       if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))
                goto out;
        res->jiffies = cache->jiffies;
        res->cred = cache->cred;
        res->mask = cache->mask;
+       err = 0;
 out:
        rcu_read_unlock();
        return err;
@@ -2491,12 +2505,13 @@ EXPORT_SYMBOL_GPL(nfs_may_open);
 static int nfs_execute_ok(struct inode *inode, int mask)
 {
        struct nfs_server *server = NFS_SERVER(inode);
-       int ret;
+       int ret = 0;
 
-       if (mask & MAY_NOT_BLOCK)
-               ret = nfs_revalidate_inode_rcu(server, inode);
-       else
-               ret = nfs_revalidate_inode(server, inode);
+       if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS)) {
+               if (mask & MAY_NOT_BLOCK)
+                       return -ECHILD;
+               ret = __nfs_revalidate_inode(server, inode);
+       }
        if (ret == 0 && !execute_ok(inode))
                ret = -EACCES;
        return ret;