From 3b160794c0e94e38f1652f7bd9e3eaa6c91ea06d Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Mon, 1 Dec 2008 14:35:00 -0800
Subject: [PATCH] --- yaml --- r: 124997 b: refs/heads/master c:
 52afeefb9dac9287429642189996426a2bfd6a25 h: refs/heads/master i:   124995:
 c9a12ea76eeb2d4677d4bbac16abf1473ba4fb7e v: v3

---
 [refs]              |  2 +-
 trunk/fs/dcache.c   |  8 ++++++--
 trunk/fs/seq_file.c | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 69e482159c57..5830020ca78f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be42c4c433c2c0d3f1583c08908fead00d36d222
+refs/heads/master: 52afeefb9dac9287429642189996426a2bfd6a25
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index c231a639c2a2..bdb3f50248a7 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -1908,7 +1908,8 @@ static int prepend_name(char **buffer, int *buflen, struct qstr *name)
  * Convert a dentry into an ASCII path name. If the entry has been deleted
  * the string " (deleted)" is appended. Note that this is ambiguous.
  *
- * Returns the buffer or an error code if the path was too long.
+ * Returns a pointer into the buffer or an error code if the
+ * path was too long.
  *
  * "buflen" should be positive. Caller holds the dcache_lock.
  *
@@ -1984,7 +1985,10 @@ char *__d_path(const struct path *path, struct path *root,
  * Convert a dentry into an ASCII path name. If the entry has been deleted
  * the string " (deleted)" is appended. Note that this is ambiguous.
  *
- * Returns the buffer or an error code if the path was too long.
+ * Returns a pointer into the buffer or an error code if the path was
+ * too long. Note: Callers should use the returned pointer, not the passed
+ * in buffer, to use the name! The implementation often starts at an offset
+ * into the buffer, and may leave 0 bytes at the start.
  *
  * "buflen" should be positive.
  */
diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c
index 16c211558c22..99d8b8cfc9b7 100644
--- a/trunk/fs/seq_file.c
+++ b/trunk/fs/seq_file.c
@@ -389,8 +389,14 @@ char *mangle_path(char *s, char *p, char *esc)
 }
 EXPORT_SYMBOL(mangle_path);
 
-/*
- * return the absolute path of 'dentry' residing in mount 'mnt'.
+/**
+ * seq_path - seq_file interface to print a pathname
+ * @m: the seq_file handle
+ * @path: the struct path to print
+ * @esc: set of characters to escape in the output
+ *
+ * return the absolute path of 'path', as represented by the
+ * dentry / mnt pair in the path parameter.
  */
 int seq_path(struct seq_file *m, struct path *path, char *esc)
 {