staging: lustre: misc: clean up DFID related error messages

Improve the error messages related to DFID output and parsing
for usage in userspace.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1606
Reviewed-on: http://review.whamcloud.com/6156
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index e6e655cf7fab29608ee6d0719a5043236af5e9d2..222b6bfba66c74379256ebad88e75858e44c2758 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -537,13 +537,14 @@ static inline void ostid_set_id(struct ost_id *oi, __u64 oid)
 {
        if (fid_seq_is_mdt0(oi->oi.oi_seq)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Bad %llu to set " DOSTID "\n", oid, POSTID(oi));
+                       CERROR("Too large OID %#llx to set MDT0 " DOSTID "\n",
+                              oid, POSTID(oi));
                        return;
                }
                oi->oi.oi_id = oid;
        } else if (fid_is_idif(&oi->oi_fid)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Bad %llu to set "DOSTID"\n",
+                       CERROR("Too large OID %#llx to set IDIF " DOSTID "\n",
                               oid, POSTID(oi));
                        return;
                }
@@ -569,7 +570,7 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
 
        if (fid_is_idif(fid)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Too large OID %#llx to set IDIF "DFID"\n",
+                       CERROR("Too large OID %#llx to set IDIF " DFID "\n",
                               (unsigned long long)oid, PFID(fid));
                        return -EBADF;
                }
@@ -578,7 +579,7 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
                fid->f_ver = oid >> 48;
        } else {
                if (oid >= OBIF_MAX_OID) {
-                       CERROR("Too large OID %#llx to set REG "DFID"\n",
+                       CERROR("Too large OID %#llx to set REG " DFID "\n",
                               (unsigned long long)oid, PFID(fid));
                        return -EBADF;
                }

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 856e2f99a8a0a05857c1dfa47b99e99e731940cd..183f3bec9f330d181bac1564fed6bf0a806a74c3 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -528,25 +528,20 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
 }
 
 /* printf display format
- * e.g. printf("file FID is "DFID"\n", PFID(fid));
+ * * usage: printf("file FID is "DFID"\n", PFID(fid));
  */
 #define FID_NOBRACE_LEN 40
 #define FID_LEN (FID_NOBRACE_LEN + 2)
 #define DFID_NOBRACE "%#llx:0x%x:0x%x"
 #define DFID "["DFID_NOBRACE"]"
-#define PFID(fid)     \
-       (fid)->f_seq, \
-       (fid)->f_oid, \
-       (fid)->f_ver
+#define PFID(fid) (unsigned long long)(fid)->f_seq, (fid)->f_oid, (fid)->f_ver
 
-/* scanf input parse format -- strip '[' first.
- * e.g. sscanf(fidstr, SFID, RFID(&fid));
+/* scanf input parse format for fids in DFID_NOBRACE format
+ * Need to strip '[' from DFID format first or use "["SFID"]" at caller.
+ * usage: sscanf(fidstr, SFID, RFID(&fid));
  */
 #define SFID "0x%llx:0x%x:0x%x"
-#define RFID(fid)     \
-       &((fid)->f_seq), \
-       &((fid)->f_oid), \
-       &((fid)->f_ver)
+#define RFID(fid) &((fid)->f_seq), &((fid)->f_oid), &((fid)->f_ver)
 
 /********* Quotas **********/