Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5170 utils: Add support for --list-commands option
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_compat.h
diff --git
a/lustre/include/lustre_compat.h
b/lustre/include/lustre_compat.h
index
4229fa5
..
18d0105
100644
(file)
--- a/
lustre/include/lustre_compat.h
+++ b/
lustre/include/lustre_compat.h
@@
-158,7
+158,7
@@
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
#ifdef HAVE_BVEC_ITER
#define bio_idx(bio) (bio->bi_iter.bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_iter.bi_sector = sector)
#ifdef HAVE_BVEC_ITER
#define bio_idx(bio) (bio->bi_iter.bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_iter.bi_sector = sector)
-#define bvl_to_page(bvl) (bvl
.
bv_page)
+#define bvl_to_page(bvl) (bvl
->
bv_page)
#else
#define bio_idx(bio) (bio->bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_sector = sector)
#else
#define bio_idx(bio) (bio->bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_sector = sector)
@@
-413,4
+413,10
@@
static inline void truncate_inode_pages_final(struct address_space *map)
#endif
#endif
#endif
#endif
+#ifdef HAVE_PID_NS_FOR_CHILDREN
+# define ll_task_pid_ns(task) ((task)->nsproxy->pid_ns_for_children)
+#else
+# define ll_task_pid_ns(task) ((task)->nsproxy->pid_ns)
+#endif
+
#endif /* _LUSTRE_COMPAT_H */
#endif /* _LUSTRE_COMPAT_H */