Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

md: kill file_path wrapper

Browse source 
Kill the trivial and rather pointless file_path wrapper around d_path.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2008-05-23 13:04:34 -07:00 committed by Linus Torvalds
parent 03de250a26
commit 6bcfd60186
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/md/bitmap.c
View file

@ -203,17 +203,6 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
* bitmap file handling - read and write the bitmap file and its superblock * bitmap file handling - read and write the bitmap file and its superblock
*/ */
/* copy the pathname of a file to a buffer */
char *file_path(struct file *file, char *buf, int count)
{
if (!buf)
return NULL;
buf = d_path(&file->f_path, buf, count);
return IS_ERR(buf) ? NULL : buf;
}
/* /*
* basic page I/O operations * basic page I/O operations
*/ */
@ -721,11 +710,13 @@ static void bitmap_file_kick(struct bitmap *bitmap)
if (bitmap->file) { if (bitmap->file) {
path = kmalloc(PAGE_SIZE, GFP_KERNEL); path = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (path) if (path)
ptr = file_path(bitmap->file, path, PAGE_SIZE); ptr = d_path(&bitmap->file->f_path, path,
PAGE_SIZE);
printk(KERN_ALERT printk(KERN_ALERT
"%s: kicking failed bitmap file %s from array!\n", "%s: kicking failed bitmap file %s from array!\n",
bmname(bitmap), ptr ? ptr : ""); bmname(bitmap), IS_ERR(ptr) ? "" : ptr);
kfree(path); kfree(path);
} else } else

4
drivers/md/md.c
View file

@ -3987,8 +3987,8 @@ static int get_bitmap_file(mddev_t * mddev, void __user * arg)
if (!buf) if (!buf)
goto out; goto out;
ptr = file_path(mddev->bitmap->file, buf, sizeof(file->pathname)); ptr = d_path(&mddev->bitmap->file->f_path, buf, sizeof(file->pathname));
if (!ptr) if (IS_ERR(ptr))
goto out; goto out;
strcpy(file->pathname, ptr); strcpy(file->pathname, ptr);

1
include/linux/raid/bitmap.h
View file

@ -262,7 +262,6 @@ int bitmap_create(mddev_t *mddev);
void bitmap_flush(mddev_t *mddev); void bitmap_flush(mddev_t *mddev);
void bitmap_destroy(mddev_t *mddev); void bitmap_destroy(mddev_t *mddev);
char *file_path(struct file *file, char *buf, int count);
void bitmap_print_sb(struct bitmap *bitmap); void bitmap_print_sb(struct bitmap *bitmap);
void bitmap_update_sb(struct bitmap *bitmap); void bitmap_update_sb(struct bitmap *bitmap);