projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'x86_sgx_for_v6.0-2022-08-03.1' of git://git.kernel.org/pub/scm/linux/kerne...
[linux-2.6-microblaze.git]
/
fs
/
gfs2
/
log.c
diff --git
a/fs/gfs2/log.c
b/fs/gfs2/log.c
index
f0ee3ff
..
eec4159
100644
(file)
--- a/
fs/gfs2/log.c
+++ b/
fs/gfs2/log.c
@@
-823,7
+823,7
@@
void gfs2_flush_revokes(struct gfs2_sbd *sdp)
void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
u64 seq, u32 tail, u32 lblock, u32 flags,
void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
u64 seq, u32 tail, u32 lblock, u32 flags,
-
in
t op_flags)
+
blk_opf_
t op_flags)
{
struct gfs2_log_header *lh;
u32 hash, crc;
{
struct gfs2_log_header *lh;
u32 hash, crc;
@@
-905,7
+905,7
@@
void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
static void log_write_header(struct gfs2_sbd *sdp, u32 flags)
{
static void log_write_header(struct gfs2_sbd *sdp, u32 flags)
{
-
in
t op_flags = REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC;
+
blk_opf_
t op_flags = REQ_PREFLUSH | REQ_FUA | REQ_META | REQ_SYNC;
enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
gfs2_assert_withdraw(sdp, (state != SFS_FROZEN));
enum gfs2_freeze_state state = atomic_read(&sdp->sd_freeze_state);
gfs2_assert_withdraw(sdp, (state != SFS_FROZEN));