mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-07 13:53:24 +00:00
d_path: Make d_path() use a struct path
d_path() is used on a <dentry,vfsmount> pair. Lets use a struct path to reflect this. [akpm@linux-foundation.org: fix build in mm/memory.c] Signed-off-by: Jan Blunck <jblunck@suse.de> Acked-by: Bryan Wu <bryan.wu@analog.com> Acked-by: Christoph Hellwig <hch@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Neil Brown <neilb@suse.de> Cc: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c32c2f63a9
commit
cf28b4863f
@ -126,15 +126,13 @@ static void decode_address(char *buf, unsigned long address)
|
|||||||
struct vm_area_struct *vma = vml->vma;
|
struct vm_area_struct *vma = vml->vma;
|
||||||
|
|
||||||
if (address >= vma->vm_start && address < vma->vm_end) {
|
if (address >= vma->vm_start && address < vma->vm_end) {
|
||||||
|
char _tmpbuf[256];
|
||||||
char *name = p->comm;
|
char *name = p->comm;
|
||||||
struct file *file = vma->vm_file;
|
struct file *file = vma->vm_file;
|
||||||
if (file) {
|
|
||||||
char _tmpbuf[256];
|
if (file)
|
||||||
name = d_path(file->f_dentry,
|
name = d_path(&file->f_path, _tmpbuf,
|
||||||
file->f_vfsmnt,
|
|
||||||
_tmpbuf,
|
|
||||||
sizeof(_tmpbuf));
|
sizeof(_tmpbuf));
|
||||||
}
|
|
||||||
|
|
||||||
/* FLAT does not have its text aligned to the start of
|
/* FLAT does not have its text aligned to the start of
|
||||||
* the map while FDPIC ELF does ...
|
* the map while FDPIC ELF does ...
|
||||||
|
@ -206,16 +206,10 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
|
|||||||
/* copy the pathname of a file to a buffer */
|
/* copy the pathname of a file to a buffer */
|
||||||
char *file_path(struct file *file, char *buf, int count)
|
char *file_path(struct file *file, char *buf, int count)
|
||||||
{
|
{
|
||||||
struct dentry *d;
|
|
||||||
struct vfsmount *v;
|
|
||||||
|
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
d = file->f_path.dentry;
|
buf = d_path(&file->f_path, buf, count);
|
||||||
v = file->f_path.mnt;
|
|
||||||
|
|
||||||
buf = d_path(d, v, buf, count);
|
|
||||||
|
|
||||||
return IS_ERR(buf) ? NULL : buf;
|
return IS_ERR(buf) ? NULL : buf;
|
||||||
}
|
}
|
||||||
|
@ -3563,8 +3563,7 @@ static ssize_t show_file(struct device *dev, struct device_attribute *attr,
|
|||||||
|
|
||||||
down_read(&fsg->filesem);
|
down_read(&fsg->filesem);
|
||||||
if (backing_file_is_open(curlun)) { // Get the complete pathname
|
if (backing_file_is_open(curlun)) { // Get the complete pathname
|
||||||
p = d_path(curlun->filp->f_path.dentry,
|
p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
|
||||||
curlun->filp->f_path.mnt, buf, PAGE_SIZE - 1);
|
|
||||||
if (IS_ERR(p))
|
if (IS_ERR(p))
|
||||||
rc = PTR_ERR(p);
|
rc = PTR_ERR(p);
|
||||||
else {
|
else {
|
||||||
@ -3981,8 +3980,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
|
|||||||
if (backing_file_is_open(curlun)) {
|
if (backing_file_is_open(curlun)) {
|
||||||
p = NULL;
|
p = NULL;
|
||||||
if (pathbuf) {
|
if (pathbuf) {
|
||||||
p = d_path(curlun->filp->f_path.dentry,
|
p = d_path(&curlun->filp->f_path,
|
||||||
curlun->filp->f_path.mnt,
|
|
||||||
pathbuf, PATH_MAX);
|
pathbuf, PATH_MAX);
|
||||||
if (IS_ERR(p))
|
if (IS_ERR(p))
|
||||||
p = NULL;
|
p = NULL;
|
||||||
|
@ -2853,7 +2853,7 @@ static void compat_ioctl_error(struct file *filp, unsigned int fd,
|
|||||||
/* find the name of the device. */
|
/* find the name of the device. */
|
||||||
path = (char *)__get_free_page(GFP_KERNEL);
|
path = (char *)__get_free_page(GFP_KERNEL);
|
||||||
if (path) {
|
if (path) {
|
||||||
fn = d_path(filp->f_path.dentry, filp->f_path.mnt, path, PAGE_SIZE);
|
fn = d_path(&filp->f_path, path, PAGE_SIZE);
|
||||||
if (IS_ERR(fn))
|
if (IS_ERR(fn))
|
||||||
fn = "?";
|
fn = "?";
|
||||||
}
|
}
|
||||||
|
12
fs/dcache.c
12
fs/dcache.c
@ -1845,8 +1845,7 @@ static char *__d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* d_path - return the path of a dentry
|
* d_path - return the path of a dentry
|
||||||
* @dentry: dentry to report
|
* @path: path to report
|
||||||
* @vfsmnt: vfsmnt to which the dentry belongs
|
|
||||||
* @buf: buffer to return value in
|
* @buf: buffer to return value in
|
||||||
* @buflen: buffer length
|
* @buflen: buffer length
|
||||||
*
|
*
|
||||||
@ -1857,8 +1856,7 @@ static char *__d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|||||||
*
|
*
|
||||||
* "buflen" should be positive. Caller holds the dcache_lock.
|
* "buflen" should be positive. Caller holds the dcache_lock.
|
||||||
*/
|
*/
|
||||||
char *d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
char *d_path(struct path *path, char *buf, int buflen)
|
||||||
char *buf, int buflen)
|
|
||||||
{
|
{
|
||||||
char *res;
|
char *res;
|
||||||
struct path root;
|
struct path root;
|
||||||
@ -1870,15 +1868,15 @@ char *d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|||||||
* user wants to identify the object in /proc/pid/fd/. The little hack
|
* user wants to identify the object in /proc/pid/fd/. The little hack
|
||||||
* below allows us to generate a name for these objects on demand:
|
* below allows us to generate a name for these objects on demand:
|
||||||
*/
|
*/
|
||||||
if (dentry->d_op && dentry->d_op->d_dname)
|
if (path->dentry->d_op && path->dentry->d_op->d_dname)
|
||||||
return dentry->d_op->d_dname(dentry, buf, buflen);
|
return path->dentry->d_op->d_dname(path->dentry, buf, buflen);
|
||||||
|
|
||||||
read_lock(¤t->fs->lock);
|
read_lock(¤t->fs->lock);
|
||||||
root = current->fs->root;
|
root = current->fs->root;
|
||||||
path_get(¤t->fs->root);
|
path_get(¤t->fs->root);
|
||||||
read_unlock(¤t->fs->lock);
|
read_unlock(¤t->fs->lock);
|
||||||
spin_lock(&dcache_lock);
|
spin_lock(&dcache_lock);
|
||||||
res = __d_path(dentry, vfsmnt, &root, buf, buflen);
|
res = __d_path(path->dentry, path->mnt, &root, buf, buflen);
|
||||||
spin_unlock(&dcache_lock);
|
spin_unlock(&dcache_lock);
|
||||||
path_put(&root);
|
path_put(&root);
|
||||||
return res;
|
return res;
|
||||||
|
@ -171,7 +171,7 @@ asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user * buf, size_t len)
|
|||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* FIXME: (deleted) ? */
|
/* FIXME: (deleted) ? */
|
||||||
path = d_path(dcs->path.dentry, dcs->path.mnt, kbuf, PAGE_SIZE);
|
path = d_path(&dcs->path, kbuf, PAGE_SIZE);
|
||||||
|
|
||||||
if (IS_ERR(path)) {
|
if (IS_ERR(path)) {
|
||||||
err = PTR_ERR(path);
|
err = PTR_ERR(path);
|
||||||
|
@ -345,7 +345,7 @@ static void svc_export_request(struct cache_detail *cd,
|
|||||||
char *pth;
|
char *pth;
|
||||||
|
|
||||||
qword_add(bpp, blen, exp->ex_client->name);
|
qword_add(bpp, blen, exp->ex_client->name);
|
||||||
pth = d_path(exp->ex_path.dentry, exp->ex_path.mnt, *bpp, *blen);
|
pth = d_path(&exp->ex_path, *bpp, *blen);
|
||||||
if (IS_ERR(pth)) {
|
if (IS_ERR(pth)) {
|
||||||
/* is this correct? */
|
/* is this correct? */
|
||||||
(*bpp)[0] = '\n';
|
(*bpp)[0] = '\n';
|
||||||
|
@ -1185,7 +1185,7 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
|
|||||||
if (!tmp)
|
if (!tmp)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
pathname = d_path(path->dentry, path->mnt, tmp, PAGE_SIZE);
|
pathname = d_path(path, tmp, PAGE_SIZE);
|
||||||
len = PTR_ERR(pathname);
|
len = PTR_ERR(pathname);
|
||||||
if (IS_ERR(pathname))
|
if (IS_ERR(pathname))
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -346,8 +346,7 @@ int seq_path(struct seq_file *m, struct path *path, char *esc)
|
|||||||
{
|
{
|
||||||
if (m->count < m->size) {
|
if (m->count < m->size) {
|
||||||
char *s = m->buf + m->count;
|
char *s = m->buf + m->count;
|
||||||
char *p = d_path(path->dentry, path->mnt, s,
|
char *p = d_path(path, s, m->size - m->count);
|
||||||
m->size - m->count);
|
|
||||||
if (!IS_ERR(p)) {
|
if (!IS_ERR(p)) {
|
||||||
while (s <= p) {
|
while (s <= p) {
|
||||||
char c = *p++;
|
char c = *p++;
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <linux/rcupdate.h>
|
#include <linux/rcupdate.h>
|
||||||
|
|
||||||
struct nameidata;
|
struct nameidata;
|
||||||
|
struct path;
|
||||||
struct vfsmount;
|
struct vfsmount;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -300,7 +301,7 @@ extern int d_validate(struct dentry *, struct dentry *);
|
|||||||
*/
|
*/
|
||||||
extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
||||||
|
|
||||||
extern char * d_path(struct dentry *, struct vfsmount *, char *, int);
|
extern char *d_path(struct path *, char *, int);
|
||||||
|
|
||||||
/* Allocation counts.. */
|
/* Allocation counts.. */
|
||||||
|
|
||||||
|
@ -1325,7 +1325,7 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
|
|||||||
audit_log_format(ab, "<no memory>");
|
audit_log_format(ab, "<no memory>");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
p = d_path(path->dentry, path->mnt, pathname, PATH_MAX+11);
|
p = d_path(path, pathname, PATH_MAX+11);
|
||||||
if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
|
if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
|
||||||
/* FIXME: can we save some information here? */
|
/* FIXME: can we save some information here? */
|
||||||
audit_log_format(ab, "<too long>");
|
audit_log_format(ab, "<too long>");
|
||||||
|
@ -2719,7 +2719,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
|
|||||||
if (buf) {
|
if (buf) {
|
||||||
char *p, *s;
|
char *p, *s;
|
||||||
|
|
||||||
p = d_path(f->f_dentry, f->f_vfsmnt, buf, PAGE_SIZE);
|
p = d_path(&f->f_path, buf, PAGE_SIZE);
|
||||||
if (IS_ERR(p))
|
if (IS_ERR(p))
|
||||||
p = "?";
|
p = "?";
|
||||||
s = strrchr(p, '/');
|
s = strrchr(p, '/');
|
||||||
|
Loading…
Reference in New Issue
Block a user