LU-2800 autoconf: remove obsolete autoconf options

[fs/lustre-release.git] / lustre / llite / file.c

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 8777ba6..e0611c9 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1206,35 +1206,6 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
 }
 #endif
 
-
-#ifdef HAVE_KERNEL_SENDFILE
-/*
- * Send file content (through pagecache) somewhere with helper
- */
-static ssize_t ll_file_sendfile(struct file *in_file, loff_t *ppos,size_t count,
-                                read_actor_t actor, void *target)
-{
-        struct lu_env      *env;
-        struct vvp_io_args *args;
-        ssize_t             result;
-        int                 refcheck;
-        ENTRY;
-
-        env = cl_env_get(&refcheck);
-        if (IS_ERR(env))
-                RETURN(PTR_ERR(env));
-
-        args = vvp_env_args(env, IO_SENDFILE);
-        args->u.sendfile.via_target = target;
-        args->u.sendfile.via_actor = actor;
-
-        result = ll_file_io_generic(env, args, in_file, CIT_READ, ppos, count);
-        cl_env_put(env, &refcheck);
-        RETURN(result);
-}
-#endif
-
-#ifdef HAVE_KERNEL_SPLICE_READ
 /*
  * Send file content (through pagecache) somewhere with helper
  */
@@ -1260,7 +1231,6 @@ static ssize_t ll_file_splice_read(struct file *in_file, loff_t *ppos,
         cl_env_put(env, &refcheck);
         RETURN(result);
 }
-#endif
 
 static int ll_lov_recreate(struct inode *inode, struct ost_id *oi,
                            obd_count ost_idx)
@@ -1891,8 +1861,8 @@ static int ll_swap_layouts(struct file *file1, struct file *file2,
        if (!S_ISREG(llss->inode2->i_mode))
                GOTO(free, rc = -EINVAL);
 
-       if (ll_permission(llss->inode1, MAY_WRITE, NULL) ||
-           ll_permission(llss->inode2, MAY_WRITE, NULL))
+       if (inode_permission(llss->inode1, MAY_WRITE) ||
+           inode_permission(llss->inode2, MAY_WRITE))
                GOTO(free, rc = -EPERM);
 
        if (llss->inode2->i_sb != llss->inode1->i_sb)
@@ -3043,12 +3013,7 @@ struct file_operations ll_file_operations = {
         .release        = ll_file_release,
         .mmap           = ll_file_mmap,
         .llseek         = ll_file_seek,
-#ifdef HAVE_KERNEL_SENDFILE
-        .sendfile       = ll_file_sendfile,
-#endif
-#ifdef HAVE_KERNEL_SPLICE_READ
         .splice_read    = ll_file_splice_read,
-#endif
         .fsync          = ll_fsync,
         .flush          = ll_flush
 };
@@ -3063,12 +3028,7 @@ struct file_operations ll_file_operations_flock = {
         .release        = ll_file_release,
         .mmap           = ll_file_mmap,
         .llseek         = ll_file_seek,
-#ifdef HAVE_KERNEL_SENDFILE
-        .sendfile       = ll_file_sendfile,
-#endif
-#ifdef HAVE_KERNEL_SPLICE_READ
         .splice_read    = ll_file_splice_read,
-#endif
         .fsync          = ll_fsync,
         .flush          = ll_flush,
         .flock          = ll_file_flock,
@@ -3086,12 +3046,7 @@ struct file_operations ll_file_operations_noflock = {
         .release        = ll_file_release,
         .mmap           = ll_file_mmap,
         .llseek         = ll_file_seek,
-#ifdef HAVE_KERNEL_SENDFILE
-        .sendfile       = ll_file_sendfile,
-#endif
-#ifdef HAVE_KERNEL_SPLICE_READ
         .splice_read    = ll_file_splice_read,
-#endif
         .fsync          = ll_fsync,
         .flush          = ll_flush,
         .flock          = ll_file_noflock,