LU-10698 obdclass: allow specifying complex jobids

[fs/lustre-release.git] / lustre / llite / llite_internal.h

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index e4cba7d..b885014 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -178,8 +178,8 @@ struct ll_inode_info {
 
                /* for non-directory */
                struct {
-                       struct mutex                    lli_size_mutex;
-                       char                           *lli_symlink_name;
+                       struct mutex            lli_size_mutex;
+                       char                   *lli_symlink_name;
                        /*
                         * struct rw_semaphore {
                         *    signed long       count;     // align d.d_def_acl
@@ -187,23 +187,23 @@ struct ll_inode_info {
                         *    struct list_head wait_list;
                         * }
                         */
-                       struct rw_semaphore             lli_trunc_sem;
-                       struct range_lock_tree          lli_write_tree;
+                       struct rw_semaphore     lli_trunc_sem;
+                       struct range_lock_tree  lli_write_tree;
 
-                       struct rw_semaphore             lli_glimpse_sem;
-                       cfs_time_t                      lli_glimpse_time;
-                       struct list_head                lli_agl_list;
-                       __u64                           lli_agl_index;
+                       struct rw_semaphore     lli_glimpse_sem;
+                       ktime_t                 lli_glimpse_time;
+                       struct list_head        lli_agl_list;
+                       __u64                   lli_agl_index;
 
                        /* for writepage() only to communicate to fsync */
-                       int                             lli_async_rc;
+                       int                     lli_async_rc;
 
                        /*
-                        * whenever a process try to read/write the file, the
+                        * Whenever a process try to read/write the file, the
                         * jobid of the process will be saved here, and it'll
                         * be packed into the write PRC when flush later.
                         *
-                        * so the read/write statistics for jobid will not be
+                        * So the read/write statistics for jobid will not be
                         * accurate if the file is shared by different jobs.
                         */
                        char                    lli_jobid[LUSTRE_JOBID_SIZE];
@@ -431,6 +431,7 @@ enum stats_track_type {
 #define LL_SBI_FAST_READ     0x400000 /* fast read support */
 #define LL_SBI_FILE_SECCTX   0x800000 /* set file security context at create */
 #define LL_SBI_PIO          0x1000000 /* parallel IO support */
+#define LL_SBI_TINY_WRITE   0x2000000 /* tiny write support */
 
 #define LL_SBI_FLAGS {         \
        "nolck",        \
@@ -458,6 +459,7 @@ enum stats_track_type {
        "fast_read",    \
        "file_secctx",  \
        "pio",          \
+       "tiny_write",           \
 }
 
 /* This is embedded into llite super-blocks to keep track of connect
@@ -691,6 +693,11 @@ static inline bool ll_sbi_has_fast_read(struct ll_sb_info *sbi)
        return !!(sbi->ll_flags & LL_SBI_FAST_READ);
 }
 
+static inline bool ll_sbi_has_tiny_write(struct ll_sb_info *sbi)
+{
+       return !!(sbi->ll_flags & LL_SBI_TINY_WRITE);
+}
+
 void ll_ras_enter(struct file *f);
 
 /* llite/lcommon_misc.c */
@@ -799,6 +806,8 @@ void ll_update_times(struct ptlrpc_request *request, struct inode *inode);
 int ll_writepage(struct page *page, struct writeback_control *wbc);
 int ll_writepages(struct address_space *, struct writeback_control *wbc);
 int ll_readpage(struct file *file, struct page *page);
+int ll_io_read_page(const struct lu_env *env, struct cl_io *io,
+                          struct cl_page *page, struct file *file);
 void ll_readahead_init(struct inode *inode, struct ll_readahead_state *ras);
 int vvp_io_write_commit(const struct lu_env *env, struct cl_io *io);
 
@@ -911,7 +920,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import);
 int ll_setattr(struct dentry *de, struct iattr *attr);
 int ll_statfs(struct dentry *de, struct kstatfs *sfs);
 int ll_statfs_internal(struct super_block *sb, struct obd_statfs *osfs,
-                       __u64 max_age, __u32 flags);
+                      u32 flags);
 int ll_update_inode(struct inode *inode, struct lustre_md *md);
 int ll_read_inode2(struct inode *inode, void *opaque);
 void ll_delete_inode(struct inode *inode);
@@ -1022,7 +1031,6 @@ struct ll_thread_info {
        struct iov_iter         lti_iter;
        struct vvp_io_args      lti_args;
        struct ra_io_arg        lti_ria;
-       struct kiocb            lti_kiocb;
        struct ll_cl_context    lti_io_ctx;
 };
 
@@ -1249,7 +1257,7 @@ static inline int ll_glimpse_size(struct inode *inode)
 
        down_read(&lli->lli_glimpse_sem);
        rc = cl_glimpse_size(inode);
-       lli->lli_glimpse_time = cfs_time_current();
+       lli->lli_glimpse_time = ktime_get();
        up_read(&lli->lli_glimpse_sem);
        return rc;
 }
@@ -1419,7 +1427,8 @@ static inline void d_lustre_revalidate(struct dentry *dentry)
 int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf);
 int ll_layout_refresh(struct inode *inode, __u32 *gen);
 int ll_layout_restore(struct inode *inode, loff_t start, __u64 length);
-int ll_layout_write_intent(struct inode *inode, __u64 start, __u64 end);
+int ll_layout_write_intent(struct inode *inode, enum layout_intent_opc opc,
+                          struct lu_extent *ext);
 
 int ll_xattr_init(void);
 void ll_xattr_fini(void);