diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-04-16 17:28:51 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2007-04-26 15:07:45 -0700 |
| commit | 7cdfc3a1c3971c9125c317cb8c2525745851798e (patch) | |
| tree | ac0103cba9eaf0bc07b2e63893fa4e9637e6934e /fs/ocfs2/file.c | |
| parent | 8110b073a9135acf0a71bccfc20c0d1023f179c6 (diff) | |
| download | op-kernel-dev-7cdfc3a1c3971c9125c317cb8c2525745851798e.zip op-kernel-dev-7cdfc3a1c3971c9125c317cb8c2525745851798e.tar.gz | |
ocfs2: Remember rw lock level during direct io
Cluster locking might have been redone because a direct write won't
complete, so this needs to be reflected in the iocb.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index e34474c0..520a2a6 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1542,7 +1542,7 @@ relock: pos = *ppos; /* communicate with ocfs2_dio_end_io */ - ocfs2_iocb_set_rw_locked(iocb); + ocfs2_iocb_set_rw_locked(iocb, rw_level); if (direct_io) { written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, @@ -1788,7 +1788,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, } rw_level = 0; /* communicate with ocfs2_dio_end_io */ - ocfs2_iocb_set_rw_locked(iocb); + ocfs2_iocb_set_rw_locked(iocb, rw_level); } /* |
