LU-8560 llite: handle is_compat_task() rename

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_internal.h

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index 7ad0c24..3f685a7 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -90,6 +90,10 @@ extern struct kmem_cache *dynlock_cachep;
 #define ADMIN_USR      "admin_quotafile_v2.usr"
 #define ADMIN_GRP      "admin_quotafile_v2.grp"
 
+/* Statfs space reservation for fragmentation and local objects */
+#define OSD_STATFS_RESERVED            (1ULL << 23) /* 8MB */
+#define OSD_STATFS_RESERVED_SHIFT      (7) /* reserve 0.78% of all space */
+
 struct osd_directory {
         struct iam_container od_container;
         struct iam_descr     od_descr;
@@ -129,6 +133,9 @@ struct osd_object {
        spinlock_t              oo_guard;
 
        __u32                   oo_destroyed:1;
+
+       /* the i_flags in LMA */
+       __u32                   oo_lma_flags;
         /**
          * Following two members are used to indicate the presence of dot and
          * dotdot in the given directory. This is required for interop mode
@@ -141,6 +148,8 @@ struct osd_object {
 #ifdef CONFIG_LOCKDEP
         struct lockdep_map      oo_dep_map;
 #endif
+
+       struct list_head        oo_xattr_list;
 };
 
 struct osd_obj_seq {
@@ -169,9 +178,9 @@ struct osd_mdobj {
 struct osd_mdobj_map {
        struct dentry   *omm_remote_parent;
 };
-
-#define osd_ldiskfs_add_entry(handle, child, cinode, hlock) \
-       __ldiskfs_add_entry(handle, child, cinode, hlock)
+int osd_ldiskfs_add_entry(struct osd_thread_info *info,
+                         handle_t *handle, struct dentry *child,
+                         struct inode *inode, struct htree_lock *hlock);
 
 #define OSD_OTABLE_IT_CACHE_SIZE       64
 #define OSD_OTABLE_IT_CACHE_MASK       (~(OSD_OTABLE_IT_CACHE_SIZE - 1))
@@ -350,7 +359,7 @@ struct osd_thandle {
         unsigned short          ot_credits;
         unsigned short          ot_id_cnt;
         unsigned short          ot_id_type;
-       int                     ot_remove_agents:1;
+       unsigned int            ot_remove_agents:1;
         uid_t                   ot_id_array[OSD_MAX_UGID_CNT];
        struct lquota_trans    *ot_quota_trans;
 #if OSD_THANDLE_STATS
@@ -429,7 +438,7 @@ struct osd_it_ea_dirent {
  * there  would be one ext3 readdir for every mdd readdir page.
  */
 
-#define OSD_IT_EA_BUFSIZE       (PAGE_CACHE_SIZE + PAGE_CACHE_SIZE/4)
+#define OSD_IT_EA_BUFSIZE       (PAGE_SIZE + PAGE_SIZE/4)
 
 /**
  * This is iterator's in-memory data structure in interoperability
@@ -481,7 +490,7 @@ struct osd_it_quota {
        struct list_head         oiq_list;
 };
 
-#define MAX_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / 512)
+#define MAX_BLOCKS_PER_PAGE (PAGE_SIZE / 512)
 
 struct osd_iobuf {
        wait_queue_head_t  dr_wait;
@@ -503,6 +512,8 @@ struct osd_iobuf {
        unsigned int       dr_init_at;  /* the line iobuf was initialized */
 };
 
+#define OSD_INS_CACHE_SIZE     8
+
 struct osd_thread_info {
        const struct lu_env   *oti_env;
        /**
@@ -567,6 +578,11 @@ struct osd_thread_info {
 
        struct osd_idmap_cache oti_cache;
 
+       /* dedicated OI cache for insert (which needs inum) */
+       struct osd_idmap_cache *oti_ins_cache;
+       int                    oti_ins_cache_size;
+       int                    oti_ins_cache_used;
+
         int                    oti_r_locks;
         int                    oti_w_locks;
         int                    oti_txns;
@@ -591,7 +607,9 @@ struct osd_thread_info {
 
        /* used by quota code */
        union {
-#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+#if defined(HAVE_DQUOT_QC_DQBLK)
+               struct qc_dqblk         oti_qdq;
+#elif defined(HAVE_DQUOT_FS_DISK_QUOTA)
                struct fs_disk_quota    oti_fdq;
 #else
                struct if_dqblk         oti_dqblk;
@@ -768,7 +786,8 @@ static inline void i_gid_write(struct inode *inode, gid_t gid)
 # define osd_ldiskfs_append(handle, inode, nblock) \
                ldiskfs_append(handle, inode, nblock)
 # define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
-               __ldiskfs_find_entry(dir, name, de, inlined, lock)
+               (__ldiskfs_find_entry(dir, name, de, inlined, lock) ?: \
+                ERR_PTR(-ENOENT))
 # define osd_journal_start(inode, type, nblocks) \
                ldiskfs_journal_start(inode, type, nblocks)
 # define osd_transaction_size(dev) \
@@ -793,7 +812,8 @@ static inline struct buffer_head *osd_ldiskfs_append(handle_t *handle,
 }
 
 # define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
-               __ldiskfs_find_entry(dir, name, de, lock)
+               (__ldiskfs_find_entry(dir, name, de, lock) ?: \
+                ERR_PTR(-ENOENT))
 # define osd_journal_start(inode, type, nblocks) \
                ldiskfs_journal_start(inode, nblocks)
 # define osd_transaction_size(dev) \
@@ -913,6 +933,11 @@ static inline char *osd_name(struct osd_device *osd)
        return osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name;
 }
 
+static inline bool osd_is_ea_inode(struct inode *inode)
+{
+       return !!(LDISKFS_I(inode)->i_flags & LDISKFS_EA_INODE_FL);
+}
+
 extern const struct dt_body_operations osd_body_ops;
 extern struct lu_context_key osd_key;
 
@@ -1160,7 +1185,7 @@ int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd,
 static inline int is_32bit_api(void)
 {
 #ifdef CONFIG_COMPAT
-       return is_compat_task();
+       return in_compat_syscall();
 #else
        return (BITS_PER_LONG == 32);
 #endif
@@ -1185,6 +1210,30 @@ static inline unsigned long osd_remote_parent_ino(struct osd_device *dev)
        return dev->od_mdt_map->omm_remote_parent->d_inode->i_ino;
 }
 
+/**
+ * ext4_bread/ldiskfs_bread has either 5 or 4 parameters. The error
+ * return code has been removed and integrated into the pointer in the
+ * kernel 3.18.
+ */
+static inline struct buffer_head *__ldiskfs_bread(handle_t *handle,
+                                                 struct inode *inode,
+                                                 ldiskfs_lblk_t block,
+                                                 int create)
+{
+#ifdef HAVE_EXT4_BREAD_4ARGS
+       return ldiskfs_bread(handle, inode, block, create);
+#else
+       struct buffer_head *bh;
+       int error = 0;
+
+       bh = ldiskfs_bread(handle, inode, block, create, &error);
+       if (bh == NULL && error != 0)
+               bh = ERR_PTR(error);
+
+       return bh;
+#endif
+}
+
 void ldiskfs_inc_count(handle_t *handle, struct inode *inode);
 void ldiskfs_dec_count(handle_t *handle, struct inode *inode);