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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
include
/
linux
/
lustre_compat25.h
diff --git
a/lustre/include/linux/lustre_compat25.h
b/lustre/include/linux/lustre_compat25.h
index
d5b97fd
..
cd61080
100644
(file)
--- a/
lustre/include/linux/lustre_compat25.h
+++ b/
lustre/include/linux/lustre_compat25.h
@@
-65,7
+65,11
@@
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
#define ll_set_fs_pwd set_fs_pwd
#endif /* HAVE_SET_FS_PWD */
#define ll_set_fs_pwd set_fs_pwd
#endif /* HAVE_SET_FS_PWD */
-#define ATTR_BLOCKS 0x4000
+/*
+ * set ATTR_BLOCKS to a high value to avoid any risk of collision with other
+ * ATTR_* attributes (see bug 13828)
+ */
+#define ATTR_BLOCKS (1 << 27)
#if HAVE_INODE_I_MUTEX
#define UNLOCK_INODE_MUTEX(inode) do {mutex_unlock(&(inode)->i_mutex); } while(0)
#if HAVE_INODE_I_MUTEX
#define UNLOCK_INODE_MUTEX(inode) do {mutex_unlock(&(inode)->i_mutex); } while(0)
@@
-123,8
+127,6
@@
void groups_free(struct group_info *ginfo);
#define gfp_t int
#endif
#define gfp_t int
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-
#define lock_dentry(___dentry) spin_lock(&(___dentry)->d_lock)
#define unlock_dentry(___dentry) spin_unlock(&(___dentry)->d_lock)
#define lock_dentry(___dentry) spin_lock(&(___dentry)->d_lock)
#define unlock_dentry(___dentry) spin_unlock(&(___dentry)->d_lock)
@@
-203,7
+205,7
@@
static inline int cleanup_group_info(void)
#include <linux/proc_fs.h>
#include <linux/proc_fs.h>
-#if
LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
+#if
ndef HAVE___D_REHASH
#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock)
#endif
#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock)
#endif
@@
-218,8
+220,6
@@
static inline int cleanup_group_info(void)
#define CheckWriteback(page, cmd) \
(!(!PageWriteback(page) && cmd == OBD_BRW_WRITE))
#define CheckWriteback(page, cmd) \
(!(!PageWriteback(page) && cmd == OBD_BRW_WRITE))
-#endif
-
#ifdef HAVE_PAGE_LIST
static inline int mapping_has_pages(struct address_space *mapping)
{
#ifdef HAVE_PAGE_LIST
static inline int mapping_has_pages(struct address_space *mapping)
{