The patch titled
Subject: ocfs2: add last unlock times in locking_state
has been removed from the -mm tree. Its filename was
ocfs2-add-last-unlock-times-in-locking_state.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Gang He <ghe@xxxxxxxx>
Subject: ocfs2: add last unlock times in locking_state
ocfs2 file system uses locking_state file under debugfs to dump each ocfs2
file system's dlm lock resources, but the dlm lock resources in memory are
becoming more and more after the files were touched by the user. it will
become a bit difficult to analyze these dlm lock resource records in
locking_state file by the upper scripts, though some files are not active
for now, which were accessed long time ago.
Then, I'd like to add last pr/ex unlock times in locking_state file for
each dlm lock resource record, the the upper scripts can use last unlock
time to filter inactive dlm lock resource record.
Link: http://lkml.kernel.org/r/20190425091250.3625-1-ghe@xxxxxxxx
Signed-off-by: Gang He <ghe@xxxxxxxx>
Reviewed-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Changwei Ge <gechangwei@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlmglue.c | 21 +++++++++++++++++----
fs/ocfs2/ocfs2.h | 1 +
2 files changed, 18 insertions(+), 4 deletions(-)
--- a/fs/ocfs2/dlmglue.c~ocfs2-add-last-unlock-times-in-locking_state
+++ a/fs/ocfs2/dlmglue.c
@@ -434,7 +434,7 @@ static void ocfs2_update_lock_stats(stru
struct ocfs2_mask_waiter *mw, int ret)
{
u32 usec;
- ktime_t kt;
+ ktime_t last, kt;
struct ocfs2_lock_stats *stats;
if (level == LKM_PRMODE)
@@ -444,7 +444,8 @@ static void ocfs2_update_lock_stats(stru
else
return;
- kt = ktime_sub(ktime_get(), mw->mw_lock_start);
+ last = ktime_get();
+ kt = ktime_sub(last, mw->mw_lock_start);
usec = ktime_to_us(kt);
stats->ls_gets++;
@@ -460,6 +461,8 @@ static void ocfs2_update_lock_stats(stru
if (ret)
stats->ls_fail++;
+
+ stats->ls_last = ktime_to_timespec(last).tv_sec;
}
static inline void ocfs2_track_lock_refresh(struct ocfs2_lock_res *lockres)
@@ -3079,8 +3082,10 @@ static void *ocfs2_dlm_seq_next(struct s
* - Lock stats printed
* New in version 3
* - Max time in lock stats is in usecs (instead of nsecs)
+ * New in version 4
+ * - Add last pr/ex unlock times in secs
*/
-#define OCFS2_DLM_DEBUG_STR_VERSION 3
+#define OCFS2_DLM_DEBUG_STR_VERSION 4
static int ocfs2_dlm_seq_show(struct seq_file *m, void *v)
{
int i;
@@ -3131,6 +3136,8 @@ static int ocfs2_dlm_seq_show(struct seq
# define lock_max_prmode(_l) ((_l)->l_lock_prmode.ls_max)
# define lock_max_exmode(_l) ((_l)->l_lock_exmode.ls_max)
# define lock_refresh(_l) ((_l)->l_lock_refresh)
+# define lock_last_prmode(_l) ((_l)->l_lock_prmode.ls_last)
+# define lock_last_exmode(_l) ((_l)->l_lock_exmode.ls_last)
#else
# define lock_num_prmode(_l) (0)
# define lock_num_exmode(_l) (0)
@@ -3141,6 +3148,8 @@ static int ocfs2_dlm_seq_show(struct seq
# define lock_max_prmode(_l) (0)
# define lock_max_exmode(_l) (0)
# define lock_refresh(_l) (0)
+# define lock_last_prmode(_l) (0)
+# define lock_last_exmode(_l) (0)
#endif
/* The following seq_print was added in version 2 of this output */
seq_printf(m, "%u\t"
@@ -3151,6 +3160,8 @@ static int ocfs2_dlm_seq_show(struct seq
"%llu\t"
"%u\t"
"%u\t"
+ "%u\t"
+ "%u\t"
"%u\t",
lock_num_prmode(lockres),
lock_num_exmode(lockres),
@@ -3160,7 +3171,9 @@ static int ocfs2_dlm_seq_show(struct seq
lock_total_exmode(lockres),
lock_max_prmode(lockres),
lock_max_exmode(lockres),
- lock_refresh(lockres));
+ lock_refresh(lockres),
+ lock_last_prmode(lockres),
+ lock_last_exmode(lockres));
/* End the line */
seq_printf(m, "\n");
--- a/fs/ocfs2/ocfs2.h~ocfs2-add-last-unlock-times-in-locking_state
+++ a/fs/ocfs2/ocfs2.h
@@ -150,6 +150,7 @@ struct ocfs2_lock_stats {
/* Storing max wait in usecs saves 24 bytes per inode */
u32 ls_max; /* Max wait in USEC */
+ u32 ls_last; /* Last unlock time in SEC */
};
#endif
_
Patches currently in -mm which might be from ghe@xxxxxxxx are
ocfs2-add-locking-filter-debugfs-file.patch
