diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-17 13:56:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-17 13:56:55 +1000 |
| commit | 3b67f955f0f04fda9ab72eb58b575ba7148447f0 (patch) | |
| tree | 9ce0acb9f80b887cb9d2f9ebab0d37419d268a75 /fs/ocfs2 | |
| parent | ef14dfb872cac2b33ff451568313dcd504a32e4c (diff) | |
| parent | f2614fec1f83c409bc352206f28e6c5acbaa0991 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 4 | ||||
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 8c3318bf2252..0cc19d0417bf 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -372,8 +372,8 @@ static void o2hb_wait_on_io(struct o2hb_region *reg, wait_for_completion(&wc->wc_io_complete); } -static void o2hb_bio_end_io(struct bio *bio, - int error) +static void o2hb_bio_end_io(struct bio *bio, int error, + struct batch_complete *batch) { struct o2hb_bio_wait_ctxt *wc = bio->bi_private; diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 8a7509f9e6f5..ff54014a24ec 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2288,7 +2288,7 @@ relock: ret = ocfs2_inode_lock(inode, NULL, 1); if (ret < 0) { mlog_errno(ret); - goto out_sems; + goto out; } ocfs2_inode_unlock(inode, 1); |