projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[deliverable/linux.git]
/
fs
/
gfs2
/
lops.c
diff --git
a/fs/gfs2/lops.c
b/fs/gfs2/lops.c
index 8e3ba20d5e9dfcf4d7d4450a3bc2c0d9a9c5db44..49d5a1b61b06920ca35b5b4664a3e8fc1c20aaf3 100644
(file)
--- a/
fs/gfs2/lops.c
+++ b/
fs/gfs2/lops.c
@@
-230,17
+230,19
@@
static void gfs2_end_log_write(struct bio *bio)
/**
* gfs2_log_flush_bio - Submit any pending log bio
* @sdp: The superblock
/**
* gfs2_log_flush_bio - Submit any pending log bio
* @sdp: The superblock
- * @rw: The rw flags
+ * @op: REQ_OP
+ * @op_flags: rq_flag_bits
*
* Submit any pending part-built or full bio to the block device. If
* there is no pending bio, then this is a no-op.
*/
*
* Submit any pending part-built or full bio to the block device. If
* there is no pending bio, then this is a no-op.
*/
-void gfs2_log_flush_bio(struct gfs2_sbd *sdp, int
rw
)
+void gfs2_log_flush_bio(struct gfs2_sbd *sdp, int
op, int op_flags
)
{
if (sdp->sd_log_bio) {
atomic_inc(&sdp->sd_log_in_flight);
{
if (sdp->sd_log_bio) {
atomic_inc(&sdp->sd_log_in_flight);
- submit_bio(rw, sdp->sd_log_bio);
+ bio_set_op_attrs(sdp->sd_log_bio, op, op_flags);
+ submit_bio(sdp->sd_log_bio);
sdp->sd_log_bio = NULL;
}
}
sdp->sd_log_bio = NULL;
}
}
@@
-299,7
+301,7
@@
static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno)
nblk >>= sdp->sd_fsb2bb_shift;
if (blkno == nblk)
return bio;
nblk >>= sdp->sd_fsb2bb_shift;
if (blkno == nblk)
return bio;
- gfs2_log_flush_bio(sdp,
WRITE
);
+ gfs2_log_flush_bio(sdp,
REQ_OP_WRITE, 0
);
}
return gfs2_log_alloc_bio(sdp, blkno);
}
return gfs2_log_alloc_bio(sdp, blkno);
@@
-328,7
+330,7
@@
static void gfs2_log_write(struct gfs2_sbd *sdp, struct page *page,
bio = gfs2_log_get_bio(sdp, blkno);
ret = bio_add_page(bio, page, size, offset);
if (ret == 0) {
bio = gfs2_log_get_bio(sdp, blkno);
ret = bio_add_page(bio, page, size, offset);
if (ret == 0) {
- gfs2_log_flush_bio(sdp,
WRITE
);
+ gfs2_log_flush_bio(sdp,
REQ_OP_WRITE, 0
);
bio = gfs2_log_alloc_bio(sdp, blkno);
ret = bio_add_page(bio, page, size, offset);
WARN_ON(ret == 0);
bio = gfs2_log_alloc_bio(sdp, blkno);
ret = bio_add_page(bio, page, size, offset);
WARN_ON(ret == 0);
This page took
0.029542 seconds
and
5
git commands to generate.