Merge branch 'kvm-arm/vgic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / 9p / fid.c

diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index ddf618936d8a2ca21cb5b309294bd397dbc7e1c6..d51ec9fafcc81d097924a7c3472a406f1b75048c 100644 (file)
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -41,12 +41,16 @@
  *
  */
 
-int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
+static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)
 {
-       spin_lock(&dentry->d_lock);
        hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata);
+}
+
+void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
+{
+       spin_lock(&dentry->d_lock);
+       __add_fid(dentry, fid);
        spin_unlock(&dentry->d_lock);
-       return 0;
 }
 
 /**
@@ -68,9 +72,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
        /* we'll recheck under lock if there's anything to look in */
        if (dentry->d_fsdata) {
                struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;
-               struct hlist_node *n;
                spin_lock(&dentry->d_lock);
-               hlist_for_each_entry(fid, n, h, dlist) {
+               hlist_for_each_entry(fid, h, dlist) {
                        if (any || uid_eq(fid->uid, uid)) {
                                ret = fid;
                                break;
@@ -199,8 +202,17 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,
        }
        kfree(wnames);
 fid_out:
-       if (!IS_ERR(fid))
-               v9fs_fid_add(dentry, fid);
+       if (!IS_ERR(fid)) {
+               spin_lock(&dentry->d_lock);
+               if (d_unhashed(dentry)) {
+                       spin_unlock(&dentry->d_lock);
+                       p9_client_clunk(fid);
+                       fid = ERR_PTR(-ENOENT);
+               } else {
+                       __add_fid(dentry, fid);
+                       spin_unlock(&dentry->d_lock);
+               }
+       }
 err_out:
        up_read(&v9ses->rename_sem);
        return fid;