Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / linux / file.h

diff --git a/include/linux/file.h b/include/linux/file.h
index b1e12970f617b919ad71b48ee44deaa306b6f05b..e85baebf62798b6d17e5e9376656230695a434e6 100644 (file)
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -23,7 +23,7 @@ extern struct file *alloc_file(struct path *, fmode_t mode,
 
 static inline void fput_light(struct file *file, int fput_needed)
 {
-       if (unlikely(fput_needed))
+       if (fput_needed)
                fput(file);
 }