Messages in this thread Patch in this message | | | Date | Thu, 4 Apr 2013 17:44:50 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the akpm tree |
| |
Hi Andrew,
After merging the akpm tree, today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/aio.c: In function 'aio_rw_vect_retry': fs/aio.c:1106:6: error: 'opcode' undeclared (first use in this function)
Caused by commit 36bd5dc0c4e2 ("lift sb_start_write/sb_end_write out of ->aio_write()") from the vfs tree interacting with commit 61ead3d450a4 ("aio: kill ki_retry") from the akpm tree.
I applied the following fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 4 Apr 2013 17:41:59 +1100 Subject: [PATCH] aio: kill ki_retry merge fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- fs/aio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c index 162b418..5b7ed78 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1103,7 +1103,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) if (iocb->ki_pos < 0) return -EINVAL; - if (opcode == IOCB_CMD_PWRITEV) + if (rw == WRITE) file_start_write(file); do { ret = rw_op(iocb, &iocb->ki_iovec[iocb->ki_cur_seg], @@ -1117,7 +1117,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) } while (ret > 0 && iocb->ki_left > 0 && (rw == WRITE || (!S_ISFIFO(inode->i_mode) && !S_ISSOCK(inode->i_mode)))); - if (opcode == IOCB_CMD_PWRITEV) + if (rw == WRITE) file_end_write(file); /* This means we must have transferred all that we could */ -- 1.8.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |