summaryrefslogtreecommitdiff
path: root/fs/proc/generic.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-19 09:15:50 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-19 09:15:50 +0200
commit5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch)
tree99e60bbc949e066503b598893998286c8a42861d /fs/proc/generic.c
parent998564789137921acae9e367b61c5a1dc295653d (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'fs/proc/generic.c')
-rw-r--r--fs/proc/generic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 4fb81e9c94e3..bca0f81eb687 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -330,6 +330,7 @@ retry:
spin_lock(&proc_inum_lock);
ida_remove(&proc_inum_ida, i);
spin_unlock(&proc_inum_lock);
+ return 0;
}
return PROC_DYNAMIC_FIRST + i;
}