patch-2.4.10 linux/fs/open.c
Next file: linux/fs/partitions/check.c
Previous file: linux/fs/ntfs/util.h
Back to the patch index
Back to the overall index
- Lines: 49
- Date:
Mon Sep 17 13:16:30 2001
- Orig file:
v2.4.9/linux/fs/open.c
- Orig date:
Mon Aug 27 12:41:46 2001
diff -u --recursive --new-file v2.4.9/linux/fs/open.c linux/fs/open.c
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/tty.h>
+#include <linux/iobuf.h>
#include <asm/uaccess.h>
@@ -634,6 +635,7 @@
{
struct file * f;
struct inode *inode;
+ static LIST_HEAD(kill_list);
int error;
error = -ENFILE;
@@ -654,8 +656,17 @@
f->f_pos = 0;
f->f_reada = 0;
f->f_op = fops_get(inode->i_fop);
- if (inode->i_sb)
- file_move(f, &inode->i_sb->s_files);
+ file_move(f, &inode->i_sb->s_files);
+
+ /* preallocate kiobuf for O_DIRECT */
+ f->f_iobuf = NULL;
+ f->f_iobuf_lock = 0;
+ if (f->f_flags & O_DIRECT) {
+ error = alloc_kiovec(1, &f->f_iobuf);
+ if (error)
+ goto cleanup_all;
+ }
+
if (f->f_op && f->f_op->open) {
error = f->f_op->open(inode,f);
if (error)
@@ -666,9 +677,12 @@
return f;
cleanup_all:
+ if (f->f_iobuf)
+ free_kiovec(1, &f->f_iobuf);
fops_put(f->f_op);
if (f->f_mode & FMODE_WRITE)
put_write_access(inode);
+ file_move(f, &kill_list); /* out of the way.. */
f->f_dentry = NULL;
f->f_vfsmnt = NULL;
cleanup_file:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)