LU-2800 autoconf: remove LC_SECURITY_PLUG 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 38cbedd..bc510d8 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -120,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)
@@ -132,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);
@@ -237,25 +231,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)