X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fllite_internal.h;h=c8f0f3bcf6e879fd76aaee3c399f67cf90a09be1;hp=385f38798d723305f278da7b6ba633cbfd0ef763;hb=44d5aba0bec9ae5538c37e2d018b90555f4b3f02;hpb=c2ddf78e51e7a674c3bf9e40559c5b7ca2bfe120;ds=sidebyside diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 385f387..c8f0f3b 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -68,20 +68,18 @@ #define LL_DIR_END_OFF 0x7fffffffffffffffULL #define LL_DIR_END_OFF_32BIT 0x7fffffffUL -#ifndef DCACHE_LUSTRE_INVALID -#define DCACHE_LUSTRE_INVALID 0x4000000 -#endif - #define LL_IT2STR(it) ((it) ? ldlm_it2str((it)->it_op) : "0") #define LUSTRE_FPRIVATE(file) ((file)->private_data) struct ll_dentry_data { - int lld_cwd_count; - int lld_mnt_count; - struct obd_client_handle lld_cwd_och; - struct obd_client_handle lld_mnt_och; - struct lookup_intent *lld_it; - unsigned int lld_sa_generation; + int lld_cwd_count; + int lld_mnt_count; + struct obd_client_handle lld_cwd_och; + struct obd_client_handle lld_mnt_och; + struct lookup_intent *lld_it; + unsigned int lld_sa_generation; + unsigned int lld_invalid:1; + struct rcu_head lld_rcu_head; }; #define ll_d2d(de) ((struct ll_dentry_data*)((de)->d_fsdata)) @@ -130,15 +128,15 @@ enum lli_flags { }; struct ll_inode_info { - __u32 lli_inode_magic; - __u32 lli_flags; - __u64 lli_ioepoch; + __u32 lli_inode_magic; + __u32 lli_flags; + __u64 lli_ioepoch; - cfs_spinlock_t lli_lock; - struct posix_acl *lli_posix_acl; + spinlock_t lli_lock; + struct posix_acl *lli_posix_acl; - cfs_hlist_head_t *lli_remote_perms; - cfs_mutex_t lli_rmtperm_mutex; + cfs_hlist_head_t *lli_remote_perms; + struct mutex lli_rmtperm_mutex; /* identifying fields for both metadata and data stacks. */ struct lu_fid lli_fid; @@ -167,23 +165,22 @@ struct ll_inode_info { __u64 lli_open_fd_read_count; __u64 lli_open_fd_write_count; __u64 lli_open_fd_exec_count; - /* Protects access to och pointers and their usage counters, also - * atomicity of check-update of lli_has_smd */ - cfs_mutex_t lli_och_mutex; + /* Protects access to och pointers and their usage counters */ + struct mutex lli_och_mutex; - struct inode lli_vfs_inode; + struct inode lli_vfs_inode; - /* the most recent timestamps obtained from mds */ - struct ost_lvb lli_lvb; - cfs_spinlock_t lli_agl_lock; + /* the most recent timestamps obtained from mds */ + struct ost_lvb lli_lvb; + spinlock_t lli_agl_lock; - /* Try to make the d::member and f::member are aligned. Before using - * these members, make clear whether it is directory or not. */ - union { - /* for directory */ - struct { - /* serialize normal readdir and statahead-readdir. */ - cfs_mutex_t d_readdir_mutex; + /* Try to make the d::member and f::member are aligned. Before using + * these members, make clear whether it is directory or not. */ + union { + /* for directory */ + struct { + /* serialize normal readdir and statahead-readdir. */ + struct mutex d_readdir_mutex; /* metadata statahead */ /* since parent-child threads can share the same @file @@ -194,11 +191,11 @@ struct ll_inode_info { struct ll_statahead_info *d_sai; struct posix_acl *d_def_acl; /* protect statahead stuff. */ - cfs_spinlock_t d_sa_lock; - /* "opendir_pid" is the token when lookup/revalid - * -- I am the owner of dir statahead. */ - pid_t d_opendir_pid; - } d; + spinlock_t d_sa_lock; + /* "opendir_pid" is the token when lookup/revalid + * -- I am the owner of dir statahead. */ + pid_t d_opendir_pid; + } d; #define lli_readdir_mutex u.d.d_readdir_mutex #define lli_opendir_key u.d.d_opendir_key @@ -207,29 +204,29 @@ struct ll_inode_info { #define lli_sa_lock u.d.d_sa_lock #define lli_opendir_pid u.d.d_opendir_pid - /* for non-directory */ - struct { - cfs_semaphore_t f_size_sem; - void *f_size_sem_owner; - char *f_symlink_name; - __u64 f_maxbytes; - /* - * cfs_rw_semaphore_t { - * signed long count; // align u.d.d_def_acl - * cfs_spinlock_t wait_lock; // align u.d.d_sa_lock - * struct list_head wait_list; - * } - */ - cfs_rw_semaphore_t f_trunc_sem; - cfs_mutex_t f_write_mutex; + /* for non-directory */ + struct { + struct semaphore f_size_sem; + void *f_size_sem_owner; + char *f_symlink_name; + __u64 f_maxbytes; + /* + * struct rw_semaphore { + * signed long count; // align d.d_def_acl + * spinlock_t wait_lock; // align d.d_sa_lock + * struct list_head wait_list; + * } + */ + struct rw_semaphore f_trunc_sem; + struct mutex f_write_mutex; - cfs_rw_semaphore_t f_glimpse_sem; + struct rw_semaphore f_glimpse_sem; cfs_time_t f_glimpse_time; cfs_list_t f_agl_list; __u64 f_agl_index; - /* for writepage() only to communicate to fsync */ - int f_async_rc; + /* for writepage() only to communicate to fsync */ + int f_async_rc; /* * whenever a process try to read/write the file, the @@ -271,7 +268,9 @@ struct ll_inode_info { struct cl_object *lli_clob; /* mutex to request for layout lock exclusively. */ - cfs_mutex_t lli_layout_mutex; + struct mutex lli_layout_mutex; + /* valid only inside LAYOUT ibits lock, protected by lli_layout_mutex */ + __u32 lli_layout_gen; }; /* @@ -409,8 +408,8 @@ struct rmtacl_ctl_entry { }; struct rmtacl_ctl_table { - cfs_spinlock_t rct_lock; - cfs_list_t rct_entries[RCE_HASHES]; + spinlock_t rct_lock; + cfs_list_t rct_entries[RCE_HASHES]; }; #define EE_HASHES 32 @@ -424,17 +423,17 @@ struct eacl_entry { }; struct eacl_table { - cfs_spinlock_t et_lock; - cfs_list_t et_entries[EE_HASHES]; + spinlock_t et_lock; + cfs_list_t et_entries[EE_HASHES]; }; struct ll_sb_info { - cfs_list_t ll_list; - /* this protects pglist and ra_info. It isn't safe to - * grab from interrupt contexts */ - cfs_spinlock_t ll_lock; - cfs_spinlock_t ll_pp_extent_lock; /* Lock for pp_extent entries */ - cfs_spinlock_t ll_process_lock; /* Lock for ll_rw_process_info */ + cfs_list_t ll_list; + /* this protects pglist and ra_info. It isn't safe to + * grab from interrupt contexts */ + spinlock_t ll_lock; + spinlock_t ll_pp_extent_lock; /* pp_extent entry*/ + spinlock_t ll_process_lock; /* ll_rw_process_info */ struct obd_uuid ll_sb_uuid; struct obd_export *ll_md_exp; struct obd_export *ll_dt_exp; @@ -450,7 +449,7 @@ struct ll_sb_info { struct lprocfs_stats *ll_stats; /* lprocfs stats counter */ - struct cl_client_lru ll_lru; + struct cl_client_cache ll_cache; struct lprocfs_stats *ll_ra_stats; @@ -503,7 +502,7 @@ struct ll_ra_read { * per file-descriptor read-ahead data. */ struct ll_readahead_state { - cfs_spinlock_t ras_lock; + spinlock_t ras_lock; /* * index of the last page that read(2) needed and that wasn't in the * cache. Used by ras_update() to detect seeks. @@ -602,7 +601,7 @@ struct ll_file_data { struct lov_stripe_md; -extern cfs_spinlock_t inode_lock; +extern spinlock_t inode_lock; extern struct proc_dir_entry *proc_lustre_fs_root; @@ -688,7 +687,6 @@ int ll_writepages(struct address_space *, struct writeback_control *wbc); void ll_removepage(struct page *page); int ll_readpage(struct file *file, struct page *page); void ll_readahead_init(struct inode *inode, struct ll_readahead_state *ras); -void ll_truncate(struct inode *inode); int ll_file_punch(struct inode *, loff_t, int); ssize_t ll_file_lockless_io(struct file *, char *, size_t, loff_t *, int); void ll_clear_file_contended(struct inode*); @@ -707,7 +705,7 @@ extern int ll_inode_revalidate_it(struct dentry *, struct lookup_intent *, extern int ll_have_md_lock(struct inode *inode, __u64 *bits, ldlm_mode_t l_req_mode); extern ldlm_mode_t ll_take_md_lock(struct inode *inode, __u64 bits, - struct lustre_handle *lockh); + struct lustre_handle *lockh, __u64 flags); int __ll_inode_revalidate_it(struct dentry *, struct lookup_intent *, __u64 bits); int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd); @@ -740,6 +738,8 @@ int ll_getattr_it(struct vfsmount *mnt, struct dentry *de, struct lookup_intent *it, struct kstat *stat); int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat); struct ll_file_data *ll_file_data_get(void); +struct posix_acl * ll_get_acl(struct inode *inode, int type); + #ifdef HAVE_GENERIC_PERMISSION_4ARGS int ll_inode_permission(struct inode *inode, int mask, unsigned int flags); #else @@ -749,6 +749,7 @@ int ll_inode_permission(struct inode *inode, int mask, struct nameidata *nd); int ll_inode_permission(struct inode *inode, int mask); # endif #endif + int ll_lov_setstripe_ea_info(struct inode *inode, struct file *file, int flags, struct lov_user_md *lum, int lum_size); @@ -819,9 +820,14 @@ void ll_umount_begin(struct vfsmount *vfsmnt, int flags); void ll_umount_begin(struct super_block *sb); #endif int ll_remount_fs(struct super_block *sb, int *flags, char *data); +#ifdef HAVE_SUPEROPS_USE_DENTRY +int ll_show_options(struct seq_file *seq, struct dentry *dentry); +#else int ll_show_options(struct seq_file *seq, struct vfsmount *vfs); +#endif +void ll_dirty_page_discard_warn(cfs_page_t *page, int ioret); int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req, - struct super_block *); + struct super_block *); void lustre_dump_dentry(struct dentry *, int recur); void lustre_dump_inode(struct inode *); int ll_obd_statfs(struct inode *inode, void *arg); @@ -853,11 +859,11 @@ extern struct inode_operations ll_fast_symlink_inode_operations; /* llite/llite_close.c */ struct ll_close_queue { - cfs_spinlock_t lcq_lock; - cfs_list_t lcq_head; - cfs_waitq_t lcq_waitq; - cfs_completion_t lcq_comp; - cfs_atomic_t lcq_stop; + spinlock_t lcq_lock; + cfs_list_t lcq_head; + cfs_waitq_t lcq_waitq; + struct completion lcq_comp; + cfs_atomic_t lcq_stop; }; struct ccc_object *cl_inode2ccc(struct inode *inode); @@ -1104,9 +1110,10 @@ static inline struct obd_export *ll_i2mdexp(struct inode *inode) static inline struct lu_fid *ll_inode2fid(struct inode *inode) { struct lu_fid *fid; + LASSERT(inode != NULL); fid = &ll_i2info(inode)->lli_fid; - LASSERT(fid_is_igif(fid) || fid_ver(fid) == 0); + return fid; } @@ -1242,8 +1249,8 @@ struct ll_statahead_info { cfs_list_t sai_entries_stated; /* entries stated */ cfs_list_t sai_entries_agl; /* AGL entries to be sent */ cfs_list_t sai_cache[LL_SA_CACHE_SIZE]; - cfs_spinlock_t sai_cache_lock[LL_SA_CACHE_SIZE]; - cfs_atomic_t sai_cache_count; /* entry count in cache */ + spinlock_t sai_cache_lock[LL_SA_CACHE_SIZE]; + cfs_atomic_t sai_cache_count; /* entry count in cache */ }; int do_statahead_enter(struct inode *dir, struct dentry **dentry, @@ -1252,14 +1259,14 @@ void ll_stop_statahead(struct inode *dir, void *key); static inline int ll_glimpse_size(struct inode *inode) { - struct ll_inode_info *lli = ll_i2info(inode); - int rc; - - cfs_down_read(&lli->lli_glimpse_sem); - rc = cl_glimpse_size(inode); - lli->lli_glimpse_time = cfs_time_current(); - cfs_up_read(&lli->lli_glimpse_sem); - return rc; + struct ll_inode_info *lli = ll_i2info(inode); + int rc; + + down_read(&lli->lli_glimpse_sem); + rc = cl_glimpse_size(inode); + lli->lli_glimpse_time = cfs_time_current(); + up_read(&lli->lli_glimpse_sem); + return rc; } static inline void @@ -1291,6 +1298,10 @@ ll_statahead_enter(struct inode *dir, struct dentry **dentryp, int only_unplug) if (lli->lli_opendir_pid != cfs_curproc_pid()) return -EAGAIN; + /* statahead has been stopped */ + if (lli->lli_opendir_key == NULL) + return -EAGAIN; + ldd = ll_d2d(*dentryp); /* * When stats a dentry, the system trigger more than once "revalidate" @@ -1488,12 +1499,17 @@ static inline void ll_unlock_dcache(struct inode *inode) static inline int d_lustre_invalid(const struct dentry *dentry) { - return dentry->d_flags & DCACHE_LUSTRE_INVALID; + struct ll_dentry_data *lld = ll_d2d(dentry); + + return (lld == NULL) || lld->lld_invalid; } static inline void __d_lustre_invalidate(struct dentry *dentry) { - dentry->d_flags |= DCACHE_LUSTRE_INVALID; + struct ll_dentry_data *lld = ll_d2d(dentry); + + if (lld != NULL) + lld->lld_invalid = 1; } /* @@ -1517,7 +1533,8 @@ static inline void d_lustre_invalidate(struct dentry *dentry) static inline void d_lustre_revalidate(struct dentry *dentry) { spin_lock(&dentry->d_lock); - dentry->d_flags &= ~DCACHE_LUSTRE_INVALID; + LASSERT(ll_d2d(dentry) != NULL); + ll_d2d(dentry)->lld_invalid = 0; spin_unlock(&dentry->d_lock); }