diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-15 11:37:47 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 12:57:20 +0400 |
| commit | 0b3fca1fd1499f0f5a7486d494f96538f2b7e5b9 (patch) | |
| tree | 53c2152346840cc335483543c166cd47914fbfb0 | |
| parent | 6b5e1223d9c3fae19b1a2acd789d9dab97de67c4 (diff) | |
| download | linux-0b3fca1fd1499f0f5a7486d494f96538f2b7e5b9.tar.bz2 | |
kill find_inode_number()
the only remaining caller (in ncpfs) is guaranteed to return 0 -
we only hit it if we'd just checked that there's no dentry with
such name.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/dcache.c | 29 | ||||
| -rw-r--r-- | fs/ncpfs/dir.c | 2 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
3 files changed, 0 insertions, 32 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index b7f049c31526..b692c7e097c5 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2984,35 +2984,6 @@ void d_tmpfile(struct dentry *dentry, struct inode *inode) } EXPORT_SYMBOL(d_tmpfile); -/** - * find_inode_number - check for dentry with name - * @dir: directory to check - * @name: Name to find. - * - * Check whether a dentry already exists for the given name, - * and return the inode number if it has an inode. Otherwise - * 0 is returned. - * - * This routine is used to post-process directory listings for - * filesystems using synthetic inode numbers, and is necessary - * to keep getcwd() working. - */ - -ino_t find_inode_number(struct dentry *dir, struct qstr *name) -{ - struct dentry * dentry; - ino_t ino = 0; - - dentry = d_hash_and_lookup(dir, name); - if (!IS_ERR_OR_NULL(dentry)) { - if (dentry->d_inode) - ino = dentry->d_inode->i_ino; - dput(dentry); - } - return ino; -} -EXPORT_SYMBOL(find_inode_number); - static __initdata unsigned long dhash_entries; static int __init set_dhash_entries(char *str) { diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index e5d488530580..3bc105d36f10 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -660,8 +660,6 @@ end_advance: ctl.valid = 0; if (!ctl.filled && (ctl.fpos == ctx->pos)) { if (!ino) - ino = find_inode_number(dentry, &qname); - if (!ino) ino = iunique(dir->i_sb, 2); ctl.filled = !dir_emit(ctx, qname.name, qname.len, ino, DT_UNKNOWN); diff --git a/include/linux/fs.h b/include/linux/fs.h index ab11c44b0697..1db01c13ddce 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2311,7 +2311,6 @@ extern struct file * open_exec(const char *); /* fs/dcache.c -- generic fs support functions */ extern int is_subdir(struct dentry *, struct dentry *); extern int path_is_under(struct path *, struct path *); -extern ino_t find_inode_number(struct dentry *, struct qstr *); #include <linux/err.h> |