From: Peng Tao Date: Thu, 21 Nov 2013 14:28:26 +0000 (+0800) Subject: staging/lustre: move IFTODT/DTTOIF to lustre_idl.h X-Git-Tag: v3.14-rc1~150^2~735 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79783924db1e2e090ea32b0076d262c321f9bf9c;p=pandora-kernel.git staging/lustre: move IFTODT/DTTOIF to lustre_idl.h They are in fact definition of how client/server talks to each other about file type. Cc: Andreas Dilger Signed-off-by: Peng Tao Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h index 102afa217f85..fdec53a6c8a3 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h @@ -61,15 +61,4 @@ #define flock_end(fl) ((fl)->fl_end) #define flock_set_end(fl, end) do { (fl)->fl_end = (end); } while (0) -#ifndef IFSHIFT -#define IFSHIFT 12 -#endif - -#ifndef IFTODT -#define IFTODT(type) (((type) & S_IFMT) >> IFSHIFT) -#endif -#ifndef DTTOIF -#define DTTOIF(dirtype) ((dirtype) << IFSHIFT) -#endif - #endif Reading git-diff-tree failed