libceph, rbd, ceph: convert to use the new mount API

[sfrench/cifs-2.6.git] / fs / ceph / cache.c

diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index b2ec29eeb4c4fda7ed65efe6ee07503dbdfb6f53..73f24f307a4a63560946352b1f50d40f8ecdfa37 100644 (file)
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -8,6 +8,7 @@
 
 #include <linux/ceph/ceph_debug.h>
 
+#include <linux/fs_context.h>
 #include "super.h"
 #include "cache.h"
 
@@ -49,7 +50,7 @@ void ceph_fscache_unregister(void)
        fscache_unregister_netfs(&ceph_cache_netfs);
 }
 
-int ceph_fscache_register_fs(struct ceph_fs_client* fsc)
+int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
 {
        const struct ceph_fsid *fsid = &fsc->client->fsid;
        const char *fscache_uniq = fsc->mount_options->fscache_uniq;
@@ -66,8 +67,8 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc)
                if (uniq_len && memcmp(ent->uniquifier, fscache_uniq, uniq_len))
                        continue;
 
-               pr_err("fscache cookie already registered for fsid %pU\n", fsid);
-               pr_err("  use fsc=%%s mount option to specify a uniquifier\n");
+               errorf(fc, "ceph: fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option",
+                      fsid);
                err = -EBUSY;
                goto out_unlock;
        }
@@ -95,7 +96,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc)
                list_add_tail(&ent->list, &ceph_fscache_list);
        } else {
                kfree(ent);
-               pr_err("unable to register fscache cookie for fsid %pU\n",
+               errorf(fc, "ceph: unable to register fscache cookie for fsid %pU",
                       fsid);
                /* all other fs ignore this error */
        }