diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 15:07:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 15:07:01 -0400 |
| commit | 56f29d7fe452890eeeb7f2b0138b2d95b9745fb6 (patch) | |
| tree | 01b6b70297c53c9beb8d11eb186fbad9c166b1a2 /fs/inode.c | |
| parent | e823aff2d6eb43083abcc75a32ddfb167c324089 (diff) | |
| parent | 059af497c23492cb1ddcbba11c09dad385960bc0 (diff) | |
Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block: (67 commits)
[PATCH] blk_queue_start_tag() shared map race fix
[PATCH] Update axboe@suse.de email address
[PATCH] fix creating zero sized bio mempools in low memory system
[PATCH] CONFIG_BLOCK: blk_congestion_wait() fix
[PATCH] CONFIG_BLOCK internal.h cleanups
[PATCH] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]
[PATCH] BLOCK: Make it possible to disable the block layer [try #6]
[PATCH] BLOCK: Remove no-longer necessary linux/buffer_head.h inclusions [try #6]
[PATCH] BLOCK: Remove no-longer necessary linux/mpage.h inclusions [try #6]
[PATCH] BLOCK: Move the msdos device ioctl compat stuff to the msdos driver [try #6]
[PATCH] BLOCK: Move the Ext3 device ioctl compat stuff to the Ext3 driver [try #6]
[PATCH] BLOCK: Move the Ext2 device ioctl compat stuff to the Ext2 driver [try #6]
[PATCH] BLOCK: Move the ReiserFS device ioctl compat stuff to the ReiserFS driver [try #6]
[PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6]
[PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]
[PATCH] BLOCK: Move __invalidate_device() to block_dev.c [try #6]
[PATCH] BLOCK: Dissociate generic_writepages() from mpage stuff [try #6]
[PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6]
[PATCH] BLOCK: Move extern declarations out of fs/*.c into header files [try #6]
[PATCH] BLOCK: Don't call block_sync_page() from AFS [try #6]
...
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/fs/inode.c b/fs/inode.c index abf77471e6c4..ada7643104e1 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -362,27 +362,6 @@ int invalidate_inodes(struct super_block * sb) | |||
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | EXPORT_SYMBOL(invalidate_inodes); | 364 | EXPORT_SYMBOL(invalidate_inodes); |
| 365 | |||
| 366 | int __invalidate_device(struct block_device *bdev) | ||
| 367 | { | ||
| 368 | struct super_block *sb = get_super(bdev); | ||
| 369 | int res = 0; | ||
| 370 | |||
| 371 | if (sb) { | ||
| 372 | /* | ||
| 373 | * no need to lock the super, get_super holds the | ||
| 374 | * read mutex so the filesystem cannot go away | ||
| 375 | * under us (->put_super runs with the write lock | ||
| 376 | * hold). | ||
| 377 | */ | ||
| 378 | shrink_dcache_sb(sb); | ||
| 379 | res = invalidate_inodes(sb); | ||
| 380 | drop_super(sb); | ||
| 381 | } | ||
| 382 | invalidate_bdev(bdev, 0); | ||
| 383 | return res; | ||
| 384 | } | ||
| 385 | EXPORT_SYMBOL(__invalidate_device); | ||
| 386 | 365 | ||
| 387 | static int can_unuse(struct inode *inode) | 366 | static int can_unuse(struct inode *inode) |
| 388 | { | 367 | { |
