projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'chrome-platform-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
gfs2
/
glops.c
diff --git
a/fs/gfs2/glops.c
b/fs/gfs2/glops.c
index 1f6c9c3fe5cbb47361ed1e4b6d2a9dae1b3290b9..f348cfb6b69a245bb869d7d51584441d1b20b8c4 100644
(file)
--- a/
fs/gfs2/glops.c
+++ b/
fs/gfs2/glops.c
@@
-146,11
+146,11
@@
static void rgrp_go_sync(struct gfs2_glock *gl)
struct gfs2_rgrpd *rgd;
int error;
struct gfs2_rgrpd *rgd;
int error;
- spin_lock(&gl->gl_
spin
);
+ spin_lock(&gl->gl_
lockref.lock
);
rgd = gl->gl_object;
if (rgd)
gfs2_rgrp_brelse(rgd);
rgd = gl->gl_object;
if (rgd)
gfs2_rgrp_brelse(rgd);
- spin_unlock(&gl->gl_
spin
);
+ spin_unlock(&gl->gl_
lockref.lock
);
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
return;
if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))
return;
@@
-162,11
+162,11
@@
static void rgrp_go_sync(struct gfs2_glock *gl)
mapping_set_error(mapping, error);
gfs2_ail_empty_gl(gl);
mapping_set_error(mapping, error);
gfs2_ail_empty_gl(gl);
- spin_lock(&gl->gl_
spin
);
+ spin_lock(&gl->gl_
lockref.lock
);
rgd = gl->gl_object;
if (rgd)
gfs2_free_clones(rgd);
rgd = gl->gl_object;
if (rgd)
gfs2_free_clones(rgd);
- spin_unlock(&gl->gl_
spin
);
+ spin_unlock(&gl->gl_
lockref.lock
);
}
/**
}
/**
@@
-542,7
+542,7
@@
static int freeze_go_demote_ok(const struct gfs2_glock *gl)
* iopen_go_callback - schedule the dcache entry for the inode to be deleted
* @gl: the glock
*
* iopen_go_callback - schedule the dcache entry for the inode to be deleted
* @gl: the glock
*
- * gl_
spin
lock is held while calling this
+ * gl_
lockref.lock
lock is held while calling this
*/
static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
{
*/
static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
{