[PATCH] struct path: convert md (c649bb9c) · Commits · 戴 / test

drivers/md/bitmap.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -212,8 +212,8 @@ char file_path(struct file file, char *buf, int count)
		if (!buf)
		return NULL;

		d = file->f_dentry;
		v = file->f_vfsmnt;
		d = file->f_path.dentry;
		v = file->f_path.mnt;

		buf = d_path(d, v, buf, count);

		@@ -349,7 +349,7 @@ static struct page read_page(struct file file, unsigned long index,
		unsigned long count)
		{
		struct page *page = NULL;
		struct inode *inode = file->f_dentry->d_inode;
		struct inode *inode = file->f_path.dentry->d_inode;
		struct buffer_head *bh;
		sector_t block;

		@@ -662,7 +662,7 @@ static void bitmap_file_put(struct bitmap *bitmap)
		bitmap_file_unmap(bitmap);

		if (file) {
		struct inode *inode = file->f_dentry->d_inode;
		struct inode *inode = file->f_path.dentry->d_inode;
		invalidate_inode_pages(inode->i_mapping);
		fput(file);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ static int linear_ioctl(struct dm_target ti, struct inode inode,
		struct dentry fake_dentry = {};

		fake_file.f_mode = lc->dev->mode;
		fake_file.f_dentry = &fake_dentry;
		fake_file.f_path.dentry = &fake_dentry;
		fake_dentry.d_inode = bdev->bd_inode;

		return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);

+1 −1

Original line number	Diff line number	Diff line
		@@ -1272,7 +1272,7 @@ static int multipath_ioctl(struct dm_target ti, struct inode inode,
		struct dentry fake_dentry = {};
		int r = 0;

		fake_file.f_dentry = &fake_dentry;
		fake_file.f_path.dentry = &fake_dentry;

		spin_lock_irqsave(&m->lock, flags);

+2 −2

Original line number	Diff line number	Diff line
		@@ -4846,8 +4846,8 @@ static int md_seq_show(struct seq_file seq, void v)
		chunk_kb ? "KB" : "B");
		if (bitmap->file) {
		seq_printf(seq, ", file: ");
		seq_path(seq, bitmap->file->f_vfsmnt,
		bitmap->file->f_dentry," \t\n");
		seq_path(seq, bitmap->file->f_path.mnt,
		bitmap->file->f_path.dentry," \t\n");
		}

		seq_printf(seq, "\n");