From: Eric Van Hensbergen <ericvh@gmail.com>
This part of the patch contains the VFS file, dentry, & directory interface
changes related to hch's comments.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
fs/9p/vfs_dentry.c | 21 +++------------------
fs/9p/vfs_dir.c | 19 ++-----------------
fs/9p/vfs_file.c | 36 ++++++++----------------------------
3 files changed, 13 insertions(+), 63 deletions(-)
diff -puN fs/9p/vfs_dentry.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 fs/9p/vfs_dentry.c
--- devel/fs/9p/vfs_dentry.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 2005-07-14 16:23:27.000000000 -0700
+++ devel-akpm/fs/9p/vfs_dentry.c 2005-07-14 16:23:27.000000000 -0700
@@ -34,9 +34,9 @@
#include <linux/smp_lock.h>
#include <linux/inet.h>
#include <linux/namei.h>
+#include <linux/idr.h>
#include "debug.h"
-#include "idpool.h"
#include "v9fs.h"
#include "9p.h"
#include "v9fs_vfs.h"
@@ -88,18 +88,6 @@ static int v9fs_dentry_validate(struct d
}
/**
- * v9fs_dentry_delete - called when dentry refcount reaches 0
- * @dentry: dentry that is being deleted
- *
- */
-
-static int v9fs_dentry_delete(struct dentry *dentry)
-{
- dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
- return 1;
-}
-
-/**
* v9fs_dentry_release - called when dentry is going to be freed
* @dentry: dentry that is being release
*
@@ -111,13 +99,11 @@ void v9fs_dentry_release(struct dentry *
if (dentry->d_fsdata != NULL) {
struct list_head *fid_list = dentry->d_fsdata;
- struct list_head *temp;
+ struct v9fs_fid *temp = NULL;
struct v9fs_fid *current_fid = NULL;
- struct list_head *p;
struct v9fs_fcall *fcall = NULL;
- list_for_each_safe(p, temp, fid_list) {
- current_fid = list_entry(p, struct v9fs_fid, list);
+ list_for_each_entry_safe(current_fid, temp, fid_list, list) {
if (v9fs_t_clunk
(current_fid->v9ses, current_fid->fid, &fcall))
dprintk(DEBUG_ERROR, "clunk failed: %s\n",
@@ -136,6 +122,5 @@ void v9fs_dentry_release(struct dentry *
struct dentry_operations v9fs_dentry_operations = {
.d_revalidate = v9fs_dentry_validate,
- .d_delete = v9fs_dentry_delete,
.d_release = v9fs_dentry_release,
};
diff -puN fs/9p/vfs_dir.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 fs/9p/vfs_dir.c
--- devel/fs/9p/vfs_dir.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 2005-07-14 16:23:27.000000000 -0700
+++ devel-akpm/fs/9p/vfs_dir.c 2005-07-14 16:23:27.000000000 -0700
@@ -32,9 +32,9 @@
#include <linux/string.h>
#include <linux/smp_lock.h>
#include <linux/inet.h>
+#include <linux/idr.h>
#include "debug.h"
-#include "idpool.h"
#include "v9fs.h"
#include "9p.h"
#include "v9fs_vfs.h"
@@ -82,12 +82,7 @@ static int v9fs_dir_readdir(struct file
dprintk(DEBUG_VFS, "name %s\n", filp->f_dentry->d_name.name);
- if (!file)
- return -EBADF;
-
fid = file->fid;
- if (fid < 0)
- return -EBADF;
mi = kmalloc(v9ses->maxdata, GFP_KERNEL);
if (!mi)
@@ -194,13 +189,6 @@ int v9fs_dir_release(struct inode *inode
struct v9fs_fid *fid = filp->private_data;
int fidnum = -1;
- if (!fid) {
- dprintk(DEBUG_ERROR,
- "can't happen: no private data (ino %lu) (filp %p)\n",
- inode->i_ino, filp);
- return -EBADF;
- }
-
dprintk(DEBUG_VFS, "inode: %p filp: %p fid: %d\n", inode, filp,
fid->fid);
fidnum = fid->fid;
@@ -220,10 +208,7 @@ int v9fs_dir_release(struct inode *inode
v9fs_put_idpool(fid->fid, &v9ses->fidpool);
}
- if (fid->rdir_fcall) {
- kfree(fid->rdir_fcall);
- fid->rdir_fcall = NULL;
- }
+ kfree(fid->rdir_fcall);
filp->private_data = NULL;
v9fs_fid_destroy(fid);
diff -puN fs/9p/vfs_file.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 fs/9p/vfs_file.c
--- devel/fs/9p/vfs_file.c~v9fs-vfs-file-dentry-and-directory-operations-resend-take-2 2005-07-14 16:23:27.000000000 -0700
+++ devel-akpm/fs/9p/vfs_file.c 2005-07-14 16:23:27.000000000 -0700
@@ -35,9 +35,9 @@
#include <linux/version.h>
#include <linux/list.h>
#include <asm/uaccess.h>
+#include <linux/idr.h>
#include "debug.h"
-#include "idpool.h"
#include "v9fs.h"
#include "9p.h"
#include "v9fs_vfs.h"
@@ -165,13 +165,11 @@ int v9fs_file_open(struct inode *inode,
kfree(fcall);
}
- if (file) {
- file->private_data = v9fid;
- v9fid->rdir_pos = 0;
- v9fid->rdir_fcall = NULL;
- }
+ file->private_data = v9fid;
+ v9fid->rdir_pos = 0;
+ v9fid->rdir_fcall = NULL;
v9fid->fidopen = 1;
v9fid->filp = file;
v9fid->iounit = iounit;
@@ -194,8 +192,6 @@ static int v9fs_file_lock(struct file *f
struct inode *inode = filp->f_dentry->d_inode;
dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
- if (!inode)
- return -EINVAL;
/* No mandatory locks */
if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
@@ -383,38 +379,22 @@ v9fs_file_write(struct file *filp, const
return -ENOMEM;
ret = copy_from_user(buffer, data, count);
- if (ret)
+ if (ret) {
dprintk(DEBUG_ERROR, "Problem copying from user\n");
- else
+ ret = -EFAULT;
+ } else {
ret = v9fs_write(filp, buffer, count, offset);
+ }
kfree(buffer);
return ret;
}
-/**
- * v9fs_file_mmap - initiate an mmap on a file
- *
- * @filep - file pointer to write
- * @vmarea - vm area struct
- *
- * v9fs doesn't support this right now in mainline branch
- *
- */
-
-static int v9fs_file_mmap(struct file *filp, struct vm_area_struct *vm)
-{
- dprintk(DEBUG_VFS, " filp: %p - NOT IMPLEMENTED\n", filp);
-
- return -ENOSYS;
-}
-
struct file_operations v9fs_file_operations = {
.llseek = generic_file_llseek,
.read = v9fs_file_read,
.write = v9fs_file_write,
- .mmap = v9fs_file_mmap,
.open = v9fs_file_open,
.release = v9fs_dir_release,
.lock = v9fs_file_lock,
_