summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinglong Mee <mijinlong@open-fs.com>2018-07-27 14:52:21 +0800
committerAmar Tumballi <amarts@redhat.com>2018-08-21 04:49:46 +0000
commitda7c26ff1bb879c6a9489c1dc42c7a3400c9be20 (patch)
treef211b73797064a4b1df91fcbeef8a714fec6ac19
parent690ca8207269919e89341a9a49a3cff0e56e344b (diff)
gfapi: Use inode_forget in case of unlink/rename objects
After unlink/rename, the nonexistent inode should be remove from inode table, that's better than put to lru list. Change-Id: I5a40df188f3f42a2c864cfb4404b22b288fdcc12 fixes: bz#1612750 Signed-off-by: Kinglong Mee <mijinlong@open-fs.com>
-rw-r--r--api/src/glfs-fops.c11
-rw-r--r--api/src/glfs-handleops.c7
-rw-r--r--api/src/glfs-resolve.c6
3 files changed, 21 insertions, 3 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 870b287c2a7..cb6dffc9335 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -214,6 +214,11 @@ glfs_loc_unlink (loc_t *loc)
{
inode_unlink (loc->inode, loc->parent, loc->name);
+ /* since glfs_h_* objects hold a reference to inode
+ * it is safe to keep lookup count to '0' */
+ if (!inode_has_dentry (loc->inode))
+ inode_forget (loc->inode, 0);
+
return 0;
}
@@ -2713,10 +2718,14 @@ retrynew:
}
}
- if (ret == 0)
+ if (ret == 0) {
inode_rename (oldloc.parent->table, oldloc.parent, oldloc.name,
newloc.parent, newloc.name, oldloc.inode,
&oldiatt);
+
+ if (newloc.inode && !inode_has_dentry (newloc.inode))
+ inode_forget (newloc.inode, 0);
+ }
out:
loc_wipe (&oldloc);
loc_wipe (&newloc);
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c
index e40adf04d3d..343fc384ddf 100644
--- a/api/src/glfs-handleops.c
+++ b/api/src/glfs-handleops.c
@@ -1794,11 +1794,16 @@ pub_glfs_h_rename (struct glfs *fs, struct glfs_object *olddir,
ret = syncop_rename (subvol, &oldloc, &newloc, NULL, NULL);
DECODE_SYNCOP_ERR (ret);
- if (ret == 0)
+ if (ret == 0) {
inode_rename (oldloc.parent->table, oldloc.parent, oldloc.name,
newloc.parent, newloc.name, oldloc.inode,
&oldiatt);
+ if (newloc.inode && !inode_has_dentry (newloc.inode))
+ inode_forget (newloc.inode, 0);
+
+ }
+
out:
loc_wipe (&oldloc);
loc_wipe (&newloc);
diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
index 88e2d8926a0..0c4b9651bd4 100644
--- a/api/src/glfs-resolve.c
+++ b/api/src/glfs-resolve.c
@@ -397,9 +397,13 @@ glfs_resolve_component (struct glfs *fs, xlator_t *subvol, inode_t *parent,
* A stale mapping might exist for a dentry/inode that has been
* removed from another client.
*/
- if (-ret == ENOENT)
+ if (-ret == ENOENT) {
inode_unlink(loc.inode, loc.parent,
loc.name);
+ if (!inode_has_dentry (loc.inode))
+ inode_forget (loc.inode, 0);
+ }
+
inode_unref (loc.inode);
gf_uuid_clear (loc.gfid);
loc.inode = inode_new (parent->table);