Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bcfd601 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

md: kill file_path wrapper 



Kill the trivial and rather pointless file_path wrapper around d_path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 03de250a

drivers/md/bitmap.c

+4 −13
Original line number Diff line number Diff line
@@ -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

 */



/* 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

 */
@@ -721,11 +710,13 @@ static void bitmap_file_kick(struct bitmap *bitmap) 
		if (bitmap->file) {

			path = kmalloc(PAGE_SIZE, GFP_KERNEL);

			if (path)

				ptr = file_path(bitmap->file, path, PAGE_SIZE);

				ptr = d_path(&bitmap->file->f_path, path,

					     PAGE_SIZE);





			printk(KERN_ALERT

			      "%s: kicking failed bitmap file %s from array!\n",

			      bmname(bitmap), ptr ? ptr : "");

			      bmname(bitmap), IS_ERR(ptr) ? "" : ptr);



			kfree(path);

		} else

drivers/md/md.c

+2 −2
Original line number Diff line number Diff line
@@ -3987,8 +3987,8 @@ static int get_bitmap_file(mddev_t * mddev, void __user * arg) 
	if (!buf)

		goto out;



	ptr = file_path(mddev->bitmap->file, buf, sizeof(file->pathname));

	if (!ptr)

	ptr = d_path(&mddev->bitmap->file->f_path, buf, sizeof(file->pathname));

	if (IS_ERR(ptr))

		goto out;



	strcpy(file->pathname, ptr);

include/linux/raid/bitmap.h

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ int bitmap_create(mddev_t *mddev); 
void bitmap_flush(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_update_sb(struct bitmap *bitmap);