summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-29 10:49:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-29 10:52:19 -0800
commit1e8b33328a5407b447ff80953655a47014a6dcb9 (patch)
treecb5a5f90712bafe8fb64d3d221fc5213c53f681f /include
parent45bce8f3e3436bbe2e03dd2b076abdce79ffabb7 (diff)
downloadlinux-1e8b33328a5407b447ff80953655a47014a6dcb9.tar.gz
linux-1e8b33328a5407b447ff80953655a47014a6dcb9.tar.bz2
linux-1e8b33328a5407b447ff80953655a47014a6dcb9.zip
blockdev: remove bd_block_size_semaphore again
This reverts the block-device direct access code to the previous unlocked code, now that fs/buffer.c no longer needs external locking. With this, fs/block_dev.c is back to the original version, apart from a whitespace cleanup that I didn't want to revert. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index b33cfc97b9ca..44f288e9726d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -462,8 +462,6 @@ struct block_device {
int bd_fsfreeze_count;
/* Mutex for freeze */
struct mutex bd_fsfreeze_mutex;
- /* A semaphore that prevents I/O while block size is being changed */
- struct percpu_rw_semaphore bd_block_size_semaphore;
};
/*
@@ -2379,8 +2377,6 @@ extern int generic_segment_checks(const struct iovec *iov,
unsigned long *nr_segs, size_t *count, int access_flags);
/* fs/block_dev.c */
-extern ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov,
- unsigned long nr_segs, loff_t pos);
extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
extern int blkdev_fsync(struct file *filp, loff_t start, loff_t end,