git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSS2: Add sysfs entry to for the alpha blending support.
[pandora-kernel.git]
/
fs
/
file_table.c
diff --git
a/fs/file_table.c
b/fs/file_table.c
index
7a0a9b8
..
f45a449
100644
(file)
--- a/
fs/file_table.c
+++ b/
fs/file_table.c
@@
-8,6
+8,7
@@
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/file.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/file.h>
+#include <linux/fdtable.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
@@
-119,7
+120,7
@@
struct file *get_empty_filp(void)
tsk = current;
INIT_LIST_HEAD(&f->f_u.fu_list);
tsk = current;
INIT_LIST_HEAD(&f->f_u.fu_list);
- atomic_set(&f->f_count, 1);
+ atomic_
long_
set(&f->f_count, 1);
rwlock_init(&f->f_owner.lock);
f->f_uid = tsk->fsuid;
f->f_gid = tsk->fsgid;
rwlock_init(&f->f_owner.lock);
f->f_uid = tsk->fsuid;
f->f_gid = tsk->fsgid;
@@
-218,7
+219,7
@@
EXPORT_SYMBOL(init_file);
void fput(struct file *file)
{
void fput(struct file *file)
{
- if (atomic_dec_and_test(&file->f_count))
+ if (atomic_
long_
dec_and_test(&file->f_count))
__fput(file);
}
__fput(file);
}
@@
-293,7
+294,7
@@
struct file *fget(unsigned int fd)
rcu_read_lock();
file = fcheck_files(files, fd);
if (file) {
rcu_read_lock();
file = fcheck_files(files, fd);
if (file) {
- if (!atomic_inc_not_zero(&file->f_count)) {
+ if (!atomic_
long_
inc_not_zero(&file->f_count)) {
/* File object ref couldn't be taken */
rcu_read_unlock();
return NULL;
/* File object ref couldn't be taken */
rcu_read_unlock();
return NULL;
@@
-325,7
+326,7
@@
struct file *fget_light(unsigned int fd, int *fput_needed)
rcu_read_lock();
file = fcheck_files(files, fd);
if (file) {
rcu_read_lock();
file = fcheck_files(files, fd);
if (file) {
- if (atomic_inc_not_zero(&file->f_count))
+ if (atomic_
long_
inc_not_zero(&file->f_count))
*fput_needed = 1;
else
/* Didn't get the reference, someone's freed */
*fput_needed = 1;
else
/* Didn't get the reference, someone's freed */
@@
-340,7
+341,7
@@
struct file *fget_light(unsigned int fd, int *fput_needed)
void put_filp(struct file *file)
{
void put_filp(struct file *file)
{
- if (atomic_dec_and_test(&file->f_count)) {
+ if (atomic_
long_
dec_and_test(&file->f_count)) {
security_file_free(file);
file_kill(file);
file_free(file);
security_file_free(file);
file_kill(file);
file_free(file);