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

Commit ff01bb48 authored by Al Viro's avatar Al Viro
Browse files

fs: move code out of buffer.c 



Move invalidate_bdev, block_sync_page into fs/block_dev.c.  Export
kill_bdev as well, so brd doesn't have to open code it.  Reduce
buffer_head.h requirement accordingly.

Removed a rather large comment from invalidate_bdev, as it looked a bit
obsolete to bother moving.  The small comment replacing it says enough.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 94ea4158

arch/powerpc/sysdev/axonram.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include <linux/bio.h>

#include <linux/blkdev.h>

#include <linux/buffer_head.h>

#include <linux/device.h>

#include <linux/errno.h>

#include <linux/fs.h>

block/genhd.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/slab.h>

#include <linux/kmod.h>

#include <linux/kobj_map.h>

#include <linux/buffer_head.h>

#include <linux/mutex.h>

#include <linux/idr.h>

#include <linux/log2.h>

block/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/blkpg.h>

#include <linux/hdreg.h>

#include <linux/backing-dev.h>

#include <linux/buffer_head.h>

#include <linux/fs.h>

#include <linux/blktrace_api.h>

#include <asm/uaccess.h>

drivers/block/amiflop.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include <linux/mutex.h>

#include <linux/amifdreg.h>

#include <linux/amifd.h>

#include <linux/buffer_head.h>

#include <linux/fs.h>

#include <linux/blkdev.h>

#include <linux/elevator.h>

#include <linux/interrupt.h>

drivers/block/brd.c

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/highmem.h>

#include <linux/mutex.h>

#include <linux/radix-tree.h>

#include <linux/buffer_head.h> /* invalidate_bh_lrus() */

#include <linux/fs.h>

#include <linux/slab.h>



#include <asm/uaccess.h>
@@ -402,14 +402,13 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode, 
	error = -EBUSY;

	if (bdev->bd_openers <= 1) {

		/*

		 * Invalidate the cache first, so it isn't written

		 * back to the device.

		 * Kill the cache first, so it isn't written back to the

		 * device.

		 *

		 * Another thread might instantiate more buffercache here,

		 * but there is not much we can do to close that race.

		 */

		invalidate_bh_lrus();

		truncate_inode_pages(bdev->bd_inode->i_mapping, 0);

		kill_bdev(bdev);

		brd_free_pages(brd);

		error = 0;

	}