Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / fs / ocfs2 / dir.c

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 0717662..79d56dc 100644 (file)
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -744,7 +744,7 @@ restart:
                if (ocfs2_read_dir_block(dir, block, &bh, 0)) {
                        /* read error, skip block & hope for the best.
                         * ocfs2_read_dir_block() has released the bh. */
-                       ocfs2_error(dir->i_sb, "reading directory %llu, "
+                       mlog(ML_ERROR, "reading directory %llu, "
                                    "offset %lu\n",
                                    (unsigned long long)OCFS2_I(dir)->ip_blkno,
                                    block);
@@ -2073,10 +2073,12 @@ struct ocfs2_empty_dir_priv {
        unsigned seen_other;
        unsigned dx_dir;
 };
-static int ocfs2_empty_dir_filldir(void *priv, const char *name, int name_len,
-                                  loff_t pos, u64 ino, unsigned type)
+static int ocfs2_empty_dir_filldir(struct dir_context *ctx, const char *name,
+                                  int name_len, loff_t pos, u64 ino,
+                                  unsigned type)
 {
-       struct ocfs2_empty_dir_priv *p = priv;
+       struct ocfs2_empty_dir_priv *p =
+               container_of(ctx, struct ocfs2_empty_dir_priv, ctx);
 
        /*
         * Check the positions of "." and ".." records to be sure