projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RPC: add wrapper for svc_reserve to account for checksum
[powerpc.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index
e4f2616
..
8e382a5
100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-77,10
+77,9
@@
repeat:
start = files->next_fd;
newfd = start;
start = files->next_fd;
newfd = start;
- if (start < fdt->max_fds
et) {
+ if (start < fdt->max_fds
)
newfd = find_next_zero_bit(fdt->open_fds->fds_bits,
newfd = find_next_zero_bit(fdt->open_fds->fds_bits,
- fdt->max_fdset, start);
- }
+ fdt->max_fds, start);
error = -EMFILE;
if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
error = -EMFILE;
if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
@@
-204,7
+203,7
@@
asmlinkage long sys_dup(unsigned int fildes)
static int setfl(int fd, struct file * filp, unsigned long arg)
{
static int setfl(int fd, struct file * filp, unsigned long arg)
{
- struct inode * inode = filp->f_dentry->d_inode;
+ struct inode * inode = filp->f_
path.
dentry->d_inode;
int error = 0;
/*
int error = 0;
/*
@@
-553,7
+552,7
@@
int send_sigurg(struct fown_struct *fown)
}
static DEFINE_RWLOCK(fasync_lock);
}
static DEFINE_RWLOCK(fasync_lock);
-static
kmem_cache_t
*fasync_cache __read_mostly;
+static
struct kmem_cache
*fasync_cache __read_mostly;
/*
* fasync_helper() is used by some character device drivers (mainly mice)
/*
* fasync_helper() is used by some character device drivers (mainly mice)
@@
-567,7
+566,7
@@
int fasync_helper(int fd, struct file * filp, int on, struct fasync_struct **fap
int result = 0;
if (on) {
int result = 0;
if (on) {
- new = kmem_cache_alloc(fasync_cache,
SLAB
_KERNEL);
+ new = kmem_cache_alloc(fasync_cache,
GFP
_KERNEL);
if (!new)
return -ENOMEM;
}
if (!new)
return -ENOMEM;
}