Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-2800 autoconf: remove LC_BI_HW_SEGMENTS test
[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 4a02314..cd79e6e 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -51,7 +51,6 @@
 # define UNLOCK_FS_STRUCT(fs)  spin_unlock(&(fs)->lock)
 #endif
 
-#ifdef HAVE_FS_STRUCT_USE_PATH
 static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
                                  struct dentry *dentry)
 {
@@ -70,28 +69,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
                 path_put(&old_pwd);
 }
 
-#else
-
-static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
-                struct dentry *dentry)
-{
-        struct dentry *old_pwd;
-        struct vfsmount *old_pwdmnt;
-
-        LOCK_FS_STRUCT(fs);
-        old_pwd = fs->pwd;
-        old_pwdmnt = fs->pwdmnt;
-        fs->pwdmnt = mntget(mnt);
-        fs->pwd = dget(dentry);
-        UNLOCK_FS_STRUCT(fs);
-
-        if (old_pwd) {
-                dput(old_pwd);
-                mntput(old_pwdmnt);
-        }
-}
-#endif
-
 /*
  * set ATTR_BLOCKS to a high value to avoid any risk of collision with other
  * ATTR_* attributes (see bug 13828)
@@ -143,10 +120,6 @@ static inline struct file *ll_dentry_open(struct path *path, int flags,
 }
 #endif
 
-#ifdef HAVE_SECURITY_PLUG
-#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
-                vfs_symlink(dir, dentry, mnt, path, mode)
-#else
 #ifdef HAVE_4ARGS_VFS_SYMLINK
 #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
                 vfs_symlink(dir, dentry, path, mode)
@@ -155,8 +128,6 @@ static inline struct file *ll_dentry_open(struct path *path, int flags,
                        vfs_symlink(dir, dentry, path)
 #endif
 
-#endif
-
 #if !defined(HAVE_FILE_LLSEEK_SIZE) || defined(HAVE_FILE_LLSEEK_SIZE_5ARGS)
 #define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \
                generic_file_llseek_size(file, offset, origin, maxbytes, eof);
@@ -177,22 +148,10 @@ static inline struct file *ll_dentry_open(struct path *path, int flags,
 # define inode_dio_done(i)             up_read(&(i)->i_alloc_sem)
 #endif
 
-#ifdef HAVE_RW_TREE_LOCK
-#define TREE_READ_LOCK_IRQ(mapping)    read_lock_irq(&(mapping)->tree_lock)
-#define TREE_READ_UNLOCK_IRQ(mapping)  read_unlock_irq(&(mapping)->tree_lock)
-#else
-#define TREE_READ_LOCK_IRQ(mapping)    spin_lock_irq(&(mapping)->tree_lock)
-#define TREE_READ_UNLOCK_IRQ(mapping)  spin_unlock_irq(&(mapping)->tree_lock)
-#endif
-
 #ifndef FS_HAS_FIEMAP
 #define FS_HAS_FIEMAP                  (0)
 #endif
 
-#ifndef HAVE_FS_RENAME_DOES_D_MOVE
-#define FS_RENAME_DOES_D_MOVE          FS_ODD_RENAME
-#endif
-
 /* add a lustre compatible layer for crypto API */
 #include <linux/crypto.h>
 #define ll_crypto_hash          crypto_hash
@@ -260,25 +219,6 @@ unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm)
 #define ll_crypto_free_hash(tfm)            crypto_free_hash(tfm)
 #define ll_crypto_free_blkcipher(tfm)       crypto_free_blkcipher(tfm)
 
-#ifdef HAVE_SECURITY_PLUG
-#define ll_vfs_rmdir(dir,entry,mnt)             vfs_rmdir(dir,entry,mnt)
-#define ll_vfs_mkdir(inode,dir,mnt,mode)        vfs_mkdir(inode,dir,mnt,mode)
-#define ll_vfs_link(old,mnt,dir,new,mnt1)       vfs_link(old,mnt,dir,new,mnt1)
-#define ll_vfs_unlink(inode,entry,mnt)          vfs_unlink(inode,entry,mnt)
-#define ll_vfs_mknod(dir,entry,mnt,mode,dev)            \
-                vfs_mknod(dir,entry,mnt,mode,dev)
-#define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \
-                vfs_rename(old,old_dir,mnt,new,new_dir,mnt1)
-#else
-#define ll_vfs_rmdir(dir,entry,mnt)             vfs_rmdir(dir,entry)
-#define ll_vfs_mkdir(inode,dir,mnt,mode)        vfs_mkdir(inode,dir,mode)
-#define ll_vfs_link(old,mnt,dir,new,mnt1)       vfs_link(old,dir,new)
-#define ll_vfs_unlink(inode,entry,mnt)          vfs_unlink(inode,entry)
-#define ll_vfs_mknod(dir,entry,mnt,mode,dev)    vfs_mknod(dir,entry,mode,dev)
-#define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \
-                vfs_rename(old,old_dir,new,new_dir)
-#endif /* HAVE_SECURITY_PLUG */
-
 #ifdef for_each_possible_cpu
 #define cfs_for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
 #elif defined(for_each_cpu)
@@ -293,16 +233,6 @@ unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm)
 #define cfs_bio_endio(a,b,c)    bio_endio((a),(b),(c))
 #endif
 
-#ifdef HAVE_FS_STRUCT_USE_PATH
-#define cfs_fs_pwd(fs)       ((fs)->pwd.dentry)
-#define cfs_fs_mnt(fs)       ((fs)->pwd.mnt)
-#define cfs_path_put(nd)     path_put(&(nd)->path)
-#else
-#define cfs_fs_pwd(fs)       ((fs)->pwd)
-#define cfs_fs_mnt(fs)       ((fs)->pwdmnt)
-#define cfs_path_put(nd)     path_release(nd)
-#endif
-
 #ifndef HAVE_SIMPLE_SETATTR
 #define simple_setattr(dentry, ops) inode_setattr((dentry)->d_inode, ops)
 #endif
@@ -311,51 +241,6 @@ unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm)
 #define SLAB_DESTROY_BY_RCU 0
 #endif
 
-static inline int
-ll_quota_on(struct super_block *sb, int off, int ver, char *name, int remount)
-{
-        int rc;
-
-        if (sb->s_qcop->quota_on) {
-#ifdef HAVE_QUOTA_ON_USE_PATH
-                struct path path;
-
-                rc = kern_path(name, LOOKUP_FOLLOW, &path);
-                if (!rc)
-                        return rc;
-#endif
-                rc = sb->s_qcop->quota_on(sb, off, ver
-#ifdef HAVE_QUOTA_ON_USE_PATH
-                                            , &path
-#else
-                                            , name
-#endif
-#ifdef HAVE_QUOTA_ON_5ARGS
-                                            , remount
-#endif
-                                           );
-#ifdef HAVE_QUOTA_ON_USE_PATH
-                path_put(&path);
-#endif
-                return rc;
-        }
-        else
-                return -ENOSYS;
-}
-
-static inline int ll_quota_off(struct super_block *sb, int off, int remount)
-{
-        if (sb->s_qcop->quota_off) {
-                return sb->s_qcop->quota_off(sb, off
-#ifdef HAVE_QUOTA_OFF_3ARGS
-                                             , remount
-#endif
-                                            );
-        }
-        else
-                return -ENOSYS;
-}
-
 #ifndef HAVE_DQUOT_SUSPEND
 # define ll_vfs_dq_init             vfs_dq_init
 # define ll_vfs_dq_drop             vfs_dq_drop
@@ -416,11 +301,6 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define DECLARE_LL_D_HLIST_NODE_PTR(name) /* nothing */
 #endif
 
-
-#ifndef HAVE_BI_HW_SEGMENTS
-#define bio_hw_segments(q, bio) 0
-#endif
-
 #ifndef QUOTA_OK
 # define QUOTA_OK 0
 #endif
Lustre primary development and releases