Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 3.13 compat: Remove unused flags variable from __cv_init() 

GCC 4.8.1 complained about an unused flags variable when building
against Linux 2.6.26.8:

/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:
In function ‘__cv_init’:
/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:39:6:
error: variable ‘flags’ set but not used
[-Werror=unused-but-set-variable]
  int flags = KM_SLEEP;
        ^
	cc1: all warnings being treated as errors

Additionally, the superfluous code uses a preempt_count variable that is
no longer available on Linux 3.13. Deleting the unnecessary code fixes a
Linux 3.13 compatibility issue.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #312
This commit is contained in:
Richard Yao 2013-08-08 04:30:55 -04:00 committed by Brian Behlendorf
parent 30607d9b7b
commit 3e96de17d7
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/spl/spl-condvar.c
View File

@ -36,8 +36,6 @@
void void
__cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg) __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg)
{ {
int flags = KM_SLEEP;
SENTRY; SENTRY;
ASSERT(cvp); ASSERT(cvp);
ASSERT(name == NULL); ASSERT(name == NULL);
@ -51,12 +49,6 @@ __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg)
atomic_set(&cvp->cv_refs, 1); atomic_set(&cvp->cv_refs, 1);
cvp->cv_mutex = NULL; cvp->cv_mutex = NULL;
/* We may be called when there is a non-zero preempt_count or
* interrupts are disabled is which case we must not sleep.
*/
if (current_thread_info()->preempt_count || irqs_disabled())
flags = KM_NOSLEEP;
SEXIT; SEXIT;
} }
EXPORT_SYMBOL(__cv_init); EXPORT_SYMBOL(__cv_init);