The return value of ie. char devices relase() call get's swallowed inside the
kernel. Guess normally it should go upward until it reaches the close() call
originated in the userspace, however it returns always 0.
Following patch fixes that.
(BTW: I'm not used to how the patching procedure works here, if I'm expected
to do something else except posting here, please point me to it)
--- linux-2.4.16-org/include/linux/file.h Wed Aug 23 20:22:26 2000
+++ linux/include/linux/file.h Thu Nov 29 13:46:42 2001
@@ -5,7 +5,7 @@
#ifndef __LINUX_FILE_H
#define __LINUX_FILE_H
-extern void FASTCALL(fput(struct file *));
+extern int FASTCALL(fput(struct file *));
extern struct file * FASTCALL(fget(unsigned int fd));
static inline int get_close_on_exec(unsigned int fd)
--- linux-2.4.16-org/fs/file_table.c Mon Sep 17 22:16:30 2001
+++ linux/fs/file_table.c Thu Nov 29 14:33:35 2001
@@ -97,20 +97,21 @@
return 0;
}
-void fput(struct file * file)
+int fput(struct file * file)
{
struct dentry * dentry = file->f_dentry;
struct vfsmount * mnt = file->f_vfsmnt;
struct inode * inode = dentry->d_inode;
-
+ int retval = 0;
+
if (atomic_dec_and_test(&file->f_count)) {
locks_remove_flock(file);
if (file->f_iobuf)
free_kiovec(1, &file->f_iobuf);
- if (file->f_op && file->f_op->release)
- file->f_op->release(inode, file);
+ if (file->f_op && file->f_op->release)
+ retval = file->f_op->release(inode, file);
fops_put(file->f_op);
if (file->f_mode & FMODE_WRITE)
put_write_access(inode);
@@ -124,6 +125,7 @@
dput(dentry);
mntput(mnt);
}
+ return retval;
}
struct file * fget(unsigned int fd)
--- linux-2.4.16-org/fs/open.c Fri Oct 12 22:48:42 2001
+++ linux/fs/open.c Thu Nov 29 13:53:31 2001
@@ -835,7 +835,10 @@
}
fcntl_dirnotify(0, filp, 0);
locks_remove_posix(filp, id);
- fput(filp);
+ if (retval == 0)
+ retval = fput(filp);
+ else
+ fput(filp);
return retval;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Nov 30 2001 - 21:00:34 EST