aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/dev.c
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-09-30 07:39:33 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2006-09-30 07:39:33 +0000
commit6cf952ab0441b1ec67b359e3dc03d52cf62a99dd (patch)
tree86ddbec5a7ff3571bdeb7f7f511175ec23284f6b /kernel/dev.c
parent40ec17587bfee44180bc6b656545ead51a1a2037 (diff)
downloadlibfuse-6cf952ab0441b1ec67b359e3dc03d52cf62a99dd.tar.gz
Drop support for kernels earlier than 2.6.9
Diffstat (limited to 'kernel/dev.c')
-rw-r--r--kernel/dev.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/kernel/dev.c b/kernel/dev.c
index 62c41a7..d7e5e55 100644
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -54,7 +54,6 @@ void fuse_request_free(struct fuse_req *req)
kmem_cache_free(fuse_req_cachep, req);
}
-#ifdef KERNEL_2_6
static void block_sigs(sigset_t *oldset)
{
sigset_t mask;
@@ -67,43 +66,6 @@ static void restore_sigs(sigset_t *oldset)
{
sigprocmask(SIG_SETMASK, oldset, NULL);
}
-#else
-#ifdef HAVE_RECALC_SIGPENDING_TSK
-static void block_sigs(sigset_t *oldset)
-{
- spin_lock_irq(&current->sighand->siglock);
- *oldset = current->blocked;
- siginitsetinv(&current->blocked, sigmask(SIGKILL) & ~oldset->sig[0]);
- recalc_sigpending();
- spin_unlock_irq(&current->sighand->siglock);
-}
-
-static void restore_sigs(sigset_t *oldset)
-{
- spin_lock_irq(&current->sighand->siglock);
- current->blocked = *oldset;
- recalc_sigpending();
- spin_unlock_irq(&current->sighand->siglock);
-}
-#else
-static void block_sigs(sigset_t *oldset)
-{
- spin_lock_irq(&current->sigmask_lock);
- *oldset = current->blocked;
- siginitsetinv(&current->blocked, sigmask(SIGKILL) & ~oldset->sig[0]);
- recalc_sigpending(current);
- spin_unlock_irq(&current->sigmask_lock);
-}
-
-static void restore_sigs(sigset_t *oldset)
-{
- spin_lock_irq(&current->sigmask_lock);
- current->blocked = *oldset;
- recalc_sigpending(current);
- spin_unlock_irq(&current->sigmask_lock);
-}
-#endif
-#endif
static void __fuse_get_request(struct fuse_req *req)
{
@@ -681,17 +643,6 @@ static void request_wait(struct fuse_conn *fc)
remove_wait_queue(&fc->waitq, &wait);
}
-#ifndef KERNEL_2_6
-static size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
-{
- unsigned long seg;
- size_t ret = 0;
-
- for (seg = 0; seg < nr_segs; seg++)
- ret += iov[seg].iov_len;
- return ret;
-}
-#endif
/*
* Transfer an interrupt request to userspace
*