Fix o_valid and o_size for truncate through osc/ost/filterobd (on HEAD).

[fs/lustre-release.git] / lustre / include / linux / obdo.h

diff --git a/lustre/include/linux/obdo.h b/lustre/include/linux/obdo.h
index c410354..4255482 100644 (file)
--- a/lustre/include/linux/obdo.h
+++ b/lustre/include/linux/obdo.h
@@ -19,7 +19,6 @@ struct obdfs_sb_info {
         struct obd_conn          osi_conn;
         struct super_block      *osi_super;
         struct obd_device       *osi_obd;
-        struct obd_ops          *osi_ops;
         ino_t                    osi_rootino;   /* number of root inode */
         int                      osi_minor;     /* minor of /dev/obdX */
         struct list_head         osi_inodes;    /* list of dirty inodes */
@@ -89,15 +88,15 @@ static void inline obdfs_to_inode(struct inode *inode, struct obdo *oa)
 #ifdef OPS
 #warning "*** WARNING redefining OPS"
 #else
-#define OPS(sb,op) ((struct obdfs_sb_info *)(& ## sb ## ->u.generic_sbp))->osi_ops->o_ ## op
-#define IOPS(inode,op) ((struct obdfs_sb_info *)(& ## inode->i_sb ## ->u.generic_sbp))->osi_ops->o_ ## op
+#define OPS(sb,op) ((struct obdfs_sb_info *)(& (sb)->u.generic_sbp))->osi_ops->o_ ## op
+#define IOPS(inode,op) ((struct obdfs_sb_info *)(&(inode)->i_sb->u.generic_sbp))->osi_ops->o_ ## op
 #endif
 
 #ifdef ID
 #warning "*** WARNING redefining ID"
 #else
-#define ID(sb) (&((struct obdfs_sb_info *)( & ## sb ## ->u.generic_sbp))->osi_conn)
-#define IID(inode) (&((struct obdfs_sb_info *)( & ## inode->i_sb ## ->u.generic_sbp))->osi_conn)
+#define ID(sb) (&((struct obdfs_sb_info *)( &(sb)->u.generic_sbp))->osi_conn)
+#define IID(inode) (&((struct obdfs_sb_info *)( &(inode)->i_sb->u.generic_sbp))->osi_conn)
 #endif
 
 #define OBDFS_SUPER_MAGIC 0x4711