dcache: Translating dentry into pathname without taking rename_lock
[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / dcache.c
index 96655f4..38b1b09 100644 (file)
@@ -88,6 +88,44 @@ EXPORT_SYMBOL(rename_lock);
 
 static struct kmem_cache *dentry_cache __read_mostly;
 
+/**
+ * read_seqbegin_or_lock - begin a sequence number check or locking block
+ * lock: sequence lock
+ * seq : sequence number to be checked
+ *
+ * First try it once optimistically without taking the lock. If that fails,
+ * take the lock. The sequence number is also used as a marker for deciding
+ * whether to be a reader (even) or writer (odd).
+ * N.B. seq must be initialized to an even number to begin with.
+ */
+static inline void read_seqbegin_or_lock(seqlock_t *lock, int *seq)
+{
+       if (!(*seq & 1)) {      /* Even */
+               *seq = read_seqbegin(lock);
+               rcu_read_lock();
+       } else                  /* Odd */
+               write_seqlock(lock);
+}
+
+/**
+ * read_seqretry_or_unlock - end a seqretry or lock block & return retry status
+ * lock         : sequence lock
+ * seq  : sequence number
+ * Return: 1 to retry operation again, 0 to continue
+ */
+static inline int read_seqretry_or_unlock(seqlock_t *lock, int *seq)
+{
+       if (!(*seq & 1)) {      /* Even */
+               rcu_read_unlock();
+               if (read_seqretry(lock, *seq)) {
+                       (*seq)++;       /* Take writer lock */
+                       return 1;
+               }
+       } else                  /* Odd */
+               write_sequnlock(lock);
+       return 0;
+}
+
 /*
  * This is the single most critical data structure when it comes
  * to the dcache: the hashtable for lookups. Somebody should try
@@ -472,7 +510,7 @@ relock:
         * inform the fs via d_prune that this dentry is about to be
         * unhashed and destroyed.
         */
-       if (dentry->d_flags & DCACHE_OP_PRUNE)
+       if ((dentry->d_flags & DCACHE_OP_PRUNE) && !d_unhashed(dentry))
                dentry->d_op->d_prune(dentry);
 
        dentry_lru_del(dentry);
@@ -727,6 +765,14 @@ restart:
        hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
                spin_lock(&dentry->d_lock);
                if (!dentry->d_lockref.count) {
+                       /*
+                        * inform the fs via d_prune that this dentry
+                        * is about to be unhashed and destroyed.
+                        */
+                       if ((dentry->d_flags & DCACHE_OP_PRUNE) &&
+                           !d_unhashed(dentry))
+                               dentry->d_op->d_prune(dentry);
+
                        __dget_dlock(dentry);
                        __d_drop(dentry);
                        spin_unlock(&dentry->d_lock);
@@ -911,7 +957,8 @@ static void shrink_dcache_for_umount_subtree(struct dentry *dentry)
                         * inform the fs that this dentry is about to be
                         * unhashed and destroyed.
                         */
-                       if (dentry->d_flags & DCACHE_OP_PRUNE)
+                       if ((dentry->d_flags & DCACHE_OP_PRUNE) &&
+                           !d_unhashed(dentry))
                                dentry->d_op->d_prune(dentry);
 
                        dentry_lru_del(dentry);
@@ -1022,34 +1069,56 @@ static struct dentry *try_to_ascend(struct dentry *old, int locked, unsigned seq
        return new;
 }
 
+/**
+ * enum d_walk_ret - action to talke during tree walk
+ * @D_WALK_CONTINUE:   contrinue walk
+ * @D_WALK_QUIT:       quit walk
+ * @D_WALK_NORETRY:    quit when retry is needed
+ * @D_WALK_SKIP:       skip this dentry and its children
+ */
+enum d_walk_ret {
+       D_WALK_CONTINUE,
+       D_WALK_QUIT,
+       D_WALK_NORETRY,
+       D_WALK_SKIP,
+};
 
-/*
- * Search for at least 1 mount point in the dentry's subdirs.
- * We descend to the next level whenever the d_subdirs
- * list is non-empty and continue searching.
- */
 /**
- * have_submounts - check for mounts over a dentry
- * @parent: dentry to check.
+ * d_walk - walk the dentry tree
+ * @parent:    start of walk
+ * @data:      data passed to @enter() and @finish()
+ * @enter:     callback when first entering the dentry
+ * @finish:    callback when successfully finished the walk
  *
- * Return true if the parent or its subdirectories contain
- * a mount point
+ * The @enter() and @finish() callbacks are called with d_lock held.
  */
-int have_submounts(struct dentry *parent)
+static void d_walk(struct dentry *parent, void *data,
+                  enum d_walk_ret (*enter)(void *, struct dentry *),
+                  void (*finish)(void *))
 {
        struct dentry *this_parent;
        struct list_head *next;
        unsigned seq;
        int locked = 0;
+       enum d_walk_ret ret;
+       bool retry = true;
 
        seq = read_seqbegin(&rename_lock);
 again:
        this_parent = parent;
-
-       if (d_mountpoint(parent))
-               goto positive;
        spin_lock(&this_parent->d_lock);
+
+       ret = enter(data, this_parent);
+       switch (ret) {
+       case D_WALK_CONTINUE:
+               break;
+       case D_WALK_QUIT:
+       case D_WALK_SKIP:
+               goto out_unlock;
+       case D_WALK_NORETRY:
+               retry = false;
+               break;
+       }
 repeat:
        next = this_parent->d_subdirs.next;
 resume:
@@ -1059,12 +1128,22 @@ resume:
                next = tmp->next;
 
                spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
-               /* Have we found a mount point ? */
-               if (d_mountpoint(dentry)) {
+
+               ret = enter(data, dentry);
+               switch (ret) {
+               case D_WALK_CONTINUE:
+                       break;
+               case D_WALK_QUIT:
                        spin_unlock(&dentry->d_lock);
-                       spin_unlock(&this_parent->d_lock);
-                       goto positive;
+                       goto out_unlock;
+               case D_WALK_NORETRY:
+                       retry = false;
+                       break;
+               case D_WALK_SKIP:
+                       spin_unlock(&dentry->d_lock);
+                       continue;
                }
+
                if (!list_empty(&dentry->d_subdirs)) {
                        spin_unlock(&this_parent->d_lock);
                        spin_release(&dentry->d_lock.dep_map, 1, _RET_IP_);
@@ -1085,29 +1164,97 @@ resume:
                next = child->d_u.d_child.next;
                goto resume;
        }
-       spin_unlock(&this_parent->d_lock);
-       if (!locked && read_seqretry(&rename_lock, seq))
-               goto rename_retry;
-       if (locked)
-               write_sequnlock(&rename_lock);
-       return 0; /* No mount points found in tree */
-positive:
-       if (!locked && read_seqretry(&rename_lock, seq))
+       if (!locked && read_seqretry(&rename_lock, seq)) {
+               spin_unlock(&this_parent->d_lock);
                goto rename_retry;
+       }
+       if (finish)
+               finish(data);
+
+out_unlock:
+       spin_unlock(&this_parent->d_lock);
        if (locked)
                write_sequnlock(&rename_lock);
-       return 1;
+       return;
 
 rename_retry:
+       if (!retry)
+               return;
        if (locked)
                goto again;
        locked = 1;
        write_seqlock(&rename_lock);
        goto again;
 }
+
+/*
+ * Search for at least 1 mount point in the dentry's subdirs.
+ * We descend to the next level whenever the d_subdirs
+ * list is non-empty and continue searching.
+ */
+
+/**
+ * have_submounts - check for mounts over a dentry
+ * @parent: dentry to check.
+ *
+ * Return true if the parent or its subdirectories contain
+ * a mount point
+ */
+
+static enum d_walk_ret check_mount(void *data, struct dentry *dentry)
+{
+       int *ret = data;
+       if (d_mountpoint(dentry)) {
+               *ret = 1;
+               return D_WALK_QUIT;
+       }
+       return D_WALK_CONTINUE;
+}
+
+int have_submounts(struct dentry *parent)
+{
+       int ret = 0;
+
+       d_walk(parent, &ret, check_mount, NULL);
+
+       return ret;
+}
 EXPORT_SYMBOL(have_submounts);
 
 /*
+ * Called by mount code to set a mountpoint and check if the mountpoint is
+ * reachable (e.g. NFS can unhash a directory dentry and then the complete
+ * subtree can become unreachable).
+ *
+ * Only one of check_submounts_and_drop() and d_set_mounted() must succeed.  For
+ * this reason take rename_lock and d_lock on dentry and ancestors.
+ */
+int d_set_mounted(struct dentry *dentry)
+{
+       struct dentry *p;
+       int ret = -ENOENT;
+       write_seqlock(&rename_lock);
+       for (p = dentry->d_parent; !IS_ROOT(p); p = p->d_parent) {
+               /* Need exclusion wrt. check_submounts_and_drop() */
+               spin_lock(&p->d_lock);
+               if (unlikely(d_unhashed(p))) {
+                       spin_unlock(&p->d_lock);
+                       goto out;
+               }
+               spin_unlock(&p->d_lock);
+       }
+       spin_lock(&dentry->d_lock);
+       if (!d_unlinked(dentry)) {
+               dentry->d_flags |= DCACHE_MOUNTED;
+               ret = 0;
+       }
+       spin_unlock(&dentry->d_lock);
+out:
+       write_sequnlock(&rename_lock);
+       return ret;
+}
+
+/*
  * Search the dentry child list of the specified parent,
  * and move any unused dentries to the end of the unused
  * list for prune_dcache(). We descend to the next level
@@ -1121,93 +1268,46 @@ EXPORT_SYMBOL(have_submounts);
  * drop the lock and return early due to latency
  * constraints.
  */
-static int select_parent(struct dentry *parent, struct list_head *dispose)
-{
-       struct dentry *this_parent;
-       struct list_head *next;
-       unsigned seq;
-       int found = 0;
-       int locked = 0;
 
-       seq = read_seqbegin(&rename_lock);
-again:
-       this_parent = parent;
-       spin_lock(&this_parent->d_lock);
-repeat:
-       next = this_parent->d_subdirs.next;
-resume:
-       while (next != &this_parent->d_subdirs) {
-               struct list_head *tmp = next;
-               struct dentry *dentry = list_entry(tmp, struct dentry, d_u.d_child);
-               next = tmp->next;
-
-               spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
+struct select_data {
+       struct dentry *start;
+       struct list_head dispose;
+       int found;
+};
 
-               /*
-                * move only zero ref count dentries to the dispose list.
-                *
-                * Those which are presently on the shrink list, being processed
-                * by shrink_dentry_list(), shouldn't be moved.  Otherwise the
-                * loop in shrink_dcache_parent() might not make any progress
-                * and loop forever.
-                */
-               if (dentry->d_lockref.count) {
-                       dentry_lru_del(dentry);
-               } else if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) {
-                       dentry_lru_move_list(dentry, dispose);
-                       dentry->d_flags |= DCACHE_SHRINK_LIST;
-                       found++;
-               }
-               /*
-                * We can return to the caller if we have found some (this
-                * ensures forward progress). We'll be coming back to find
-                * the rest.
-                */
-               if (found && need_resched()) {
-                       spin_unlock(&dentry->d_lock);
-                       goto out;
-               }
+static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
+{
+       struct select_data *data = _data;
+       enum d_walk_ret ret = D_WALK_CONTINUE;
 
-               /*
-                * Descend a level if the d_subdirs list is non-empty.
-                */
-               if (!list_empty(&dentry->d_subdirs)) {
-                       spin_unlock(&this_parent->d_lock);
-                       spin_release(&dentry->d_lock.dep_map, 1, _RET_IP_);
-                       this_parent = dentry;
-                       spin_acquire(&this_parent->d_lock.dep_map, 0, 1, _RET_IP_);
-                       goto repeat;
-               }
+       if (data->start == dentry)
+               goto out;
 
-               spin_unlock(&dentry->d_lock);
-       }
        /*
-        * All done at this level ... ascend and resume the search.
+        * move only zero ref count dentries to the dispose list.
+        *
+        * Those which are presently on the shrink list, being processed
+        * by shrink_dentry_list(), shouldn't be moved.  Otherwise the
+        * loop in shrink_dcache_parent() might not make any progress
+        * and loop forever.
         */
-       if (this_parent != parent) {
-               struct dentry *child = this_parent;
-               this_parent = try_to_ascend(this_parent, locked, seq);
-               if (!this_parent)
-                       goto rename_retry;
-               next = child->d_u.d_child.next;
-               goto resume;
+       if (dentry->d_lockref.count) {
+               dentry_lru_del(dentry);
+       } else if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) {
+               dentry_lru_move_list(dentry, &data->dispose);
+               dentry->d_flags |= DCACHE_SHRINK_LIST;
+               data->found++;
+               ret = D_WALK_NORETRY;
        }
+       /*
+        * We can return to the caller if we have found some (this
+        * ensures forward progress). We'll be coming back to find
+        * the rest.
+        */
+       if (data->found && need_resched())
+               ret = D_WALK_QUIT;
 out:
-       spin_unlock(&this_parent->d_lock);
-       if (!locked && read_seqretry(&rename_lock, seq))
-               goto rename_retry;
-       if (locked)
-               write_sequnlock(&rename_lock);
-       return found;
-
-rename_retry:
-       if (found)
-               return found;
-       if (locked)
-               goto again;
-       locked = 1;
-       write_seqlock(&rename_lock);
-       goto again;
+       return ret;
 }
 
 /**
@@ -1216,18 +1316,90 @@ rename_retry:
  *
  * Prune the dcache to remove unused children of the parent dentry.
  */
-void shrink_dcache_parent(struct dentry * parent)
+void shrink_dcache_parent(struct dentry *parent)
 {
-       LIST_HEAD(dispose);
-       int found;
+       for (;;) {
+               struct select_data data;
+
+               INIT_LIST_HEAD(&data.dispose);
+               data.start = parent;
+               data.found = 0;
+
+               d_walk(parent, &data, select_collect, NULL);
+               if (!data.found)
+                       break;
 
-       while ((found = select_parent(parent, &dispose)) != 0) {
-               shrink_dentry_list(&dispose);
+               shrink_dentry_list(&data.dispose);
                cond_resched();
        }
 }
 EXPORT_SYMBOL(shrink_dcache_parent);
 
+static enum d_walk_ret check_and_collect(void *_data, struct dentry *dentry)
+{
+       struct select_data *data = _data;
+
+       if (d_mountpoint(dentry)) {
+               data->found = -EBUSY;
+               return D_WALK_QUIT;
+       }
+
+       return select_collect(_data, dentry);
+}
+
+static void check_and_drop(void *_data)
+{
+       struct select_data *data = _data;
+
+       if (d_mountpoint(data->start))
+               data->found = -EBUSY;
+       if (!data->found)
+               __d_drop(data->start);
+}
+
+/**
+ * check_submounts_and_drop - prune dcache, check for submounts and drop
+ *
+ * All done as a single atomic operation relative to has_unlinked_ancestor().
+ * Returns 0 if successfully unhashed @parent.  If there were submounts then
+ * return -EBUSY.
+ *
+ * @dentry: dentry to prune and drop
+ */
+int check_submounts_and_drop(struct dentry *dentry)
+{
+       int ret = 0;
+
+       /* Negative dentries can be dropped without further checks */
+       if (!dentry->d_inode) {
+               d_drop(dentry);
+               goto out;
+       }
+
+       for (;;) {
+               struct select_data data;
+
+               INIT_LIST_HEAD(&data.dispose);
+               data.start = dentry;
+               data.found = 0;
+
+               d_walk(dentry, &data, check_and_collect, check_and_drop);
+               ret = data.found;
+
+               if (!list_empty(&data.dispose))
+                       shrink_dentry_list(&data.dispose);
+
+               if (ret <= 0)
+                       break;
+
+               cond_resched();
+       }
+
+out:
+       return ret;
+}
+EXPORT_SYMBOL(check_submounts_and_drop);
+
 /**
  * __d_alloc   -       allocate a dcache entry
  * @sb: filesystem it will belong to
@@ -2510,9 +2682,39 @@ static int prepend(char **buffer, int *buflen, const char *str, int namelen)
        return 0;
 }
 
+/**
+ * prepend_name - prepend a pathname in front of current buffer pointer
+ * buffer: buffer pointer
+ * buflen: allocated length of the buffer
+ * name:   name string and length qstr structure
+ *
+ * With RCU path tracing, it may race with d_move(). Use ACCESS_ONCE() to
+ * make sure that either the old or the new name pointer and length are
+ * fetched. However, there may be mismatch between length and pointer.
+ * The length cannot be trusted, we need to copy it byte-by-byte until
+ * the length is reached or a null byte is found. It also prepends "/" at
+ * the beginning of the name. The sequence number check at the caller will
+ * retry it again when a d_move() does happen. So any garbage in the buffer
+ * due to mismatched pointer and length will be discarded.
+ */
 static int prepend_name(char **buffer, int *buflen, struct qstr *name)
 {
-       return prepend(buffer, buflen, name->name, name->len);
+       const char *dname = ACCESS_ONCE(name->name);
+       u32 dlen = ACCESS_ONCE(name->len);
+       char *p;
+
+       if (*buflen < dlen + 1)
+               return -ENAMETOOLONG;
+       *buflen -= dlen + 1;
+       p = *buffer -= dlen + 1;
+       *p++ = '/';
+       while (dlen--) {
+               char c = *dname++;
+               if (!c)
+                       break;
+               *p++ = c;
+       }
+       return 0;
 }
 
 /**
@@ -2522,7 +2724,14 @@ static int prepend_name(char **buffer, int *buflen, struct qstr *name)
  * @buffer: pointer to the end of the buffer
  * @buflen: pointer to buffer length
  *
- * Caller holds the rename_lock.
+ * The function tries to write out the pathname without taking any lock other
+ * than the RCU read lock to make sure that dentries won't go away. It only
+ * checks the sequence number of the global rename_lock as any change in the
+ * dentry's d_seq will be preceded by changes in the rename_lock sequence
+ * number. If the sequence number had been change, it will restart the whole
+ * pathname back-tracing sequence again. It performs a total of 3 trials of
+ * lockless back-tracing sequences before falling back to take the
+ * rename_lock.
  */
 static int prepend_path(const struct path *path,
                        const struct path *root,
@@ -2531,54 +2740,60 @@ static int prepend_path(const struct path *path,
        struct dentry *dentry = path->dentry;
        struct vfsmount *vfsmnt = path->mnt;
        struct mount *mnt = real_mount(vfsmnt);
-       bool slash = false;
        int error = 0;
+       unsigned seq = 0;
+       char *bptr;
+       int blen;
 
+restart:
+       bptr = *buffer;
+       blen = *buflen;
+       read_seqbegin_or_lock(&rename_lock, &seq);
        while (dentry != root->dentry || vfsmnt != root->mnt) {
                struct dentry * parent;
 
                if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
                        /* Global root? */
-                       if (!mnt_has_parent(mnt))
-                               goto global_root;
-                       dentry = mnt->mnt_mountpoint;
-                       mnt = mnt->mnt_parent;
-                       vfsmnt = &mnt->mnt;
-                       continue;
+                       if (mnt_has_parent(mnt)) {
+                               dentry = mnt->mnt_mountpoint;
+                               mnt = mnt->mnt_parent;
+                               vfsmnt = &mnt->mnt;
+                               continue;
+                       }
+                       /*
+                        * Filesystems needing to implement special "root names"
+                        * should do so with ->d_dname()
+                        */
+                       if (IS_ROOT(dentry) &&
+                          (dentry->d_name.len != 1 ||
+                           dentry->d_name.name[0] != '/')) {
+                               WARN(1, "Root dentry has weird name <%.*s>\n",
+                                    (int) dentry->d_name.len,
+                                    dentry->d_name.name);
+                       }
+                       if (!error)
+                               error = is_mounted(vfsmnt) ? 1 : 2;
+                       break;
                }
                parent = dentry->d_parent;
                prefetch(parent);
-               spin_lock(&dentry->d_lock);
-               error = prepend_name(buffer, buflen, &dentry->d_name);
-               spin_unlock(&dentry->d_lock);
-               if (!error)
-                       error = prepend(buffer, buflen, "/", 1);
+               error = prepend_name(&bptr, &blen, &dentry->d_name);
                if (error)
                        break;
 
-               slash = true;
                dentry = parent;
        }
+       if (read_seqretry_or_unlock(&rename_lock, &seq))
+               goto restart;
 
-       if (!error && !slash)
-               error = prepend(buffer, buflen, "/", 1);
-
-       return error;
-
-global_root:
-       /*
-        * Filesystems needing to implement special "root names"
-        * should do so with ->d_dname()
-        */
-       if (IS_ROOT(dentry) &&
-           (dentry->d_name.len != 1 || dentry->d_name.name[0] != '/')) {
-               WARN(1, "Root dentry has weird name <%.*s>\n",
-                    (int) dentry->d_name.len, dentry->d_name.name);
-       }
-       if (!slash)
-               error = prepend(buffer, buflen, "/", 1);
-       if (!error)
-               error = is_mounted(vfsmnt) ? 1 : 2;
+       if (error >= 0 && bptr == *buffer) {
+               if (--blen < 0)
+                       error = -ENAMETOOLONG;
+               else
+                       *--bptr = '/';
+       }
+       *buffer = bptr;
+       *buflen = blen;
        return error;
 }
 
@@ -2607,9 +2822,7 @@ char *__d_path(const struct path *path,
 
        prepend(&res, &buflen, "\0", 1);
        br_read_lock(&vfsmount_lock);
-       write_seqlock(&rename_lock);
        error = prepend_path(path, root, &res, &buflen);
-       write_sequnlock(&rename_lock);
        br_read_unlock(&vfsmount_lock);
 
        if (error < 0)
@@ -2628,9 +2841,7 @@ char *d_absolute_path(const struct path *path,
 
        prepend(&res, &buflen, "\0", 1);
        br_read_lock(&vfsmount_lock);
-       write_seqlock(&rename_lock);
        error = prepend_path(path, &root, &res, &buflen);
-       write_sequnlock(&rename_lock);
        br_read_unlock(&vfsmount_lock);
 
        if (error > 1)
@@ -2696,9 +2907,7 @@ char *d_path(const struct path *path, char *buf, int buflen)
 
        get_fs_root(current->fs, &root);
        br_read_lock(&vfsmount_lock);
-       write_seqlock(&rename_lock);
        error = path_with_deleted(path, &root, &res, &buflen);
-       write_sequnlock(&rename_lock);
        br_read_unlock(&vfsmount_lock);
        if (error < 0)
                res = ERR_PTR(error);
@@ -2733,10 +2942,10 @@ char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
        char *end = buffer + buflen;
        /* these dentries are never renamed, so d_lock is not needed */
        if (prepend(&end, &buflen, " (deleted)", 11) ||
-           prepend_name(&end, &buflen, &dentry->d_name) ||
+           prepend(&end, &buflen, dentry->d_name.name, dentry->d_name.len) ||
            prepend(&end, &buflen, "/", 1))  
                end = ERR_PTR(-ENAMETOOLONG);
-       return end;  
+       return end;
 }
 
 /*
@@ -2744,30 +2953,36 @@ char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
  */
 static char *__dentry_path(struct dentry *dentry, char *buf, int buflen)
 {
-       char *end = buf + buflen;
-       char *retval;
+       char *end, *retval;
+       int len, seq = 0;
+       int error = 0;
 
-       prepend(&end, &buflen, "\0", 1);
+restart:
+       end = buf + buflen;
+       len = buflen;
+       prepend(&end, &len, "\0", 1);
        if (buflen < 1)
                goto Elong;
        /* Get '/' right */
        retval = end-1;
        *retval = '/';
-
+       read_seqbegin_or_lock(&rename_lock, &seq);
        while (!IS_ROOT(dentry)) {
                struct dentry *parent = dentry->d_parent;
                int error;
 
                prefetch(parent);
-               spin_lock(&dentry->d_lock);
-               error = prepend_name(&end, &buflen, &dentry->d_name);
-               spin_unlock(&dentry->d_lock);
-               if (error != 0 || prepend(&end, &buflen, "/", 1) != 0)
-                       goto Elong;
+               error = prepend_name(&end, &len, &dentry->d_name);
+               if (error)
+                       break;
 
                retval = end;
                dentry = parent;
        }
+       if (read_seqretry_or_unlock(&rename_lock, &seq))
+               goto restart;
+       if (error)
+               goto Elong;
        return retval;
 Elong:
        return ERR_PTR(-ENAMETOOLONG);
@@ -2775,13 +2990,7 @@ Elong:
 
 char *dentry_path_raw(struct dentry *dentry, char *buf, int buflen)
 {
-       char *retval;
-
-       write_seqlock(&rename_lock);
-       retval = __dentry_path(dentry, buf, buflen);
-       write_sequnlock(&rename_lock);
-
-       return retval;
+       return __dentry_path(dentry, buf, buflen);
 }
 EXPORT_SYMBOL(dentry_path_raw);
 
@@ -2790,7 +2999,6 @@ char *dentry_path(struct dentry *dentry, char *buf, int buflen)
        char *p = NULL;
        char *retval;
 
-       write_seqlock(&rename_lock);
        if (d_unlinked(dentry)) {
                p = buf + buflen;
                if (prepend(&p, &buflen, "//deleted", 10) != 0)
@@ -2798,7 +3006,6 @@ char *dentry_path(struct dentry *dentry, char *buf, int buflen)
                buflen++;
        }
        retval = __dentry_path(dentry, buf, buflen);
-       write_sequnlock(&rename_lock);
        if (!IS_ERR(retval) && p)
                *p = '/';       /* restore '/' overriden with '\0' */
        return retval;
@@ -2837,7 +3044,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
 
        error = -ENOENT;
        br_read_lock(&vfsmount_lock);
-       write_seqlock(&rename_lock);
        if (!d_unlinked(pwd.dentry)) {
                unsigned long len;
                char *cwd = page + PAGE_SIZE;
@@ -2845,7 +3051,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
 
                prepend(&cwd, &buflen, "\0", 1);
                error = prepend_path(&pwd, &root, &cwd, &buflen);
-               write_sequnlock(&rename_lock);
                br_read_unlock(&vfsmount_lock);
 
                if (error < 0)
@@ -2866,7 +3071,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
                                error = -EFAULT;
                }
        } else {
-               write_sequnlock(&rename_lock);
                br_read_unlock(&vfsmount_lock);
        }
 
@@ -2919,68 +3123,24 @@ int is_subdir(struct dentry *new_dentry, struct dentry *old_dentry)
        return result;
 }
 
-void d_genocide(struct dentry *root)
+static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
 {
-       struct dentry *this_parent;
-       struct list_head *next;
-       unsigned seq;
-       int locked = 0;
+       struct dentry *root = data;
+       if (dentry != root) {
+               if (d_unhashed(dentry) || !dentry->d_inode)
+                       return D_WALK_SKIP;
 
-       seq = read_seqbegin(&rename_lock);
-again:
-       this_parent = root;
-       spin_lock(&this_parent->d_lock);
-repeat:
-       next = this_parent->d_subdirs.next;
-resume:
-       while (next != &this_parent->d_subdirs) {
-               struct list_head *tmp = next;
-               struct dentry *dentry = list_entry(tmp, struct dentry, d_u.d_child);
-               next = tmp->next;
-
-               spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
-               if (d_unhashed(dentry) || !dentry->d_inode) {
-                       spin_unlock(&dentry->d_lock);
-                       continue;
-               }
-               if (!list_empty(&dentry->d_subdirs)) {
-                       spin_unlock(&this_parent->d_lock);
-                       spin_release(&dentry->d_lock.dep_map, 1, _RET_IP_);
-                       this_parent = dentry;
-                       spin_acquire(&this_parent->d_lock.dep_map, 0, 1, _RET_IP_);
-                       goto repeat;
-               }
                if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
                        dentry->d_flags |= DCACHE_GENOCIDE;
                        dentry->d_lockref.count--;
                }
-               spin_unlock(&dentry->d_lock);
        }
-       if (this_parent != root) {
-               struct dentry *child = this_parent;
-               if (!(this_parent->d_flags & DCACHE_GENOCIDE)) {
-                       this_parent->d_flags |= DCACHE_GENOCIDE;
-                       this_parent->d_lockref.count--;
-               }
-               this_parent = try_to_ascend(this_parent, locked, seq);
-               if (!this_parent)
-                       goto rename_retry;
-               next = child->d_u.d_child.next;
-               goto resume;
-       }
-       spin_unlock(&this_parent->d_lock);
-       if (!locked && read_seqretry(&rename_lock, seq))
-               goto rename_retry;
-       if (locked)
-               write_sequnlock(&rename_lock);
-       return;
+       return D_WALK_CONTINUE;
+}
 
-rename_retry:
-       if (locked)
-               goto again;
-       locked = 1;
-       write_seqlock(&rename_lock);
-       goto again;
+void d_genocide(struct dentry *parent)
+{
+       d_walk(parent, parent, d_genocide_kill, NULL);
 }
 
 void d_tmpfile(struct dentry *dentry, struct inode *inode)