Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[mirror_ubuntu-artful-kernel.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index f56fe39fab04010174c6b300b32f69c52c6ac69c..c894d945b084d71d7672f588d561acccf143be43 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -337,7 +337,7 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
                out += snprintf(buf + out, len - out, "Disabled\n");
        else
                out += snprintf(buf + out, len - out, "%lu seconds ago\n",
-                               (get_seconds() - os->os_scantime.tv_sec));
+                               (unsigned long)(ktime_get_seconds() - os->os_scantime));
 
        out += snprintf(buf + out, len - out, "%10s => %3s  %10s\n",
                        "Slots", "Num", "RecoGen");