summaryrefslogtreecommitdiffstats
path: root/fs/fcntl.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-03-23 18:06:08 +0100
committerAnton Altaparmakov <aia21@cantab.net>2006-03-23 18:06:08 +0100
commit92fe7b9ea8ef101bff3c75ade89b93b5f62a7955 (patch)
tree3dba4faa78f1bbe4be503275173e3a63b5d60f22 /fs/fcntl.c
parentNTFS: 2.1.27 - Various bug fixes and cleanups. (diff)
parent[PATCH] reduce size of bio mempools (diff)
downloadlinux-92fe7b9ea8ef101bff3c75ade89b93b5f62a7955.tar.xz
linux-92fe7b9ea8ef101bff3c75ade89b93b5f62a7955.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r--fs/fcntl.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c
index dc4a7007f4e7..03c789560fb8 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -73,8 +73,8 @@ repeat:
* orig_start..fdt->next_fd
*/
start = orig_start;
- if (start < fdt->next_fd)
- start = fdt->next_fd;
+ if (start < files->next_fd)
+ start = files->next_fd;
newfd = start;
if (start < fdt->max_fdset) {
@@ -102,9 +102,8 @@ repeat:
* we reacquire the fdtable pointer and use it while holding
* the lock, no one can free it during that time.
*/
- fdt = files_fdtable(files);
- if (start <= fdt->next_fd)
- fdt->next_fd = newfd + 1;
+ if (start <= files->next_fd)
+ files->next_fd = newfd + 1;
error = newfd;