Commit 25782b53 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndreas 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: default avatarFrank Zago <fzago@cray.com>
Reviewed-by: default avatarBen Evans <bevans@cray.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6c6539b

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+5 −4
Original line number Diff line number Diff line
@@ -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;

		}

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+6 −11
Original line number Diff line number Diff line
@@ -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 **********/

CRA Git | Maintained and supported by SUSTech CRA and CCSE