diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /fs/ocfs2/aops.c | |
| parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
| parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'fs/ocfs2/aops.c')
| -rw-r--r-- | fs/ocfs2/aops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 3dae4a13f6e4..7e9df11260f4 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
| @@ -599,7 +599,7 @@ bail: | |||
| 599 | return ret; | 599 | return ret; |
| 600 | } | 600 | } |
| 601 | 601 | ||
| 602 | /* | 602 | /* |
| 603 | * ocfs2_dio_end_io is called by the dio core when a dio is finished. We're | 603 | * ocfs2_dio_end_io is called by the dio core when a dio is finished. We're |
| 604 | * particularly interested in the aio/dio case. Like the core uses | 604 | * particularly interested in the aio/dio case. Like the core uses |
| 605 | * i_alloc_sem, we use the rw_lock DLM lock to protect io on one node from | 605 | * i_alloc_sem, we use the rw_lock DLM lock to protect io on one node from |
| @@ -670,7 +670,7 @@ static ssize_t ocfs2_direct_IO(int rw, | |||
| 670 | 670 | ||
| 671 | ret = blockdev_direct_IO_no_locking(rw, iocb, inode, | 671 | ret = blockdev_direct_IO_no_locking(rw, iocb, inode, |
| 672 | inode->i_sb->s_bdev, iov, offset, | 672 | inode->i_sb->s_bdev, iov, offset, |
| 673 | nr_segs, | 673 | nr_segs, |
| 674 | ocfs2_direct_IO_get_blocks, | 674 | ocfs2_direct_IO_get_blocks, |
| 675 | ocfs2_dio_end_io); | 675 | ocfs2_dio_end_io); |
| 676 | 676 | ||