From 674c160a1fea8435602e746653bce0af0b648011 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Wed, 22 Sep 2010 12:42:30 +0530 Subject: [PATCH] --- yaml --- r: 218959 b: refs/heads/master c: 877cb3d4dd73838adcc6b79f2a3d29b155e7ebbe h: refs/heads/master i: 218957: 07d2b5b50f8377bf730e5e57809f7193a540e043 218955: 00173539660ebd1958cf064dea59942737aa1f6c 218951: 488634ba7de1ba0da93e98f3fe67cc657bd013ef 218943: 43c348663c3bd391e96aae3d26329cf0d9ed1c54 v: v3 --- [refs] | 2 +- trunk/fs/9p/vfs_inode.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c80a4316b5a9..a81c88ea4621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9856af8b535aaf51d95dab2087e79508f551fbb8 +refs/heads/master: 877cb3d4dd73838adcc6b79f2a3d29b155e7ebbe diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c index a69986c80328..34bf71b56542 100644 --- a/trunk/fs/9p/vfs_inode.c +++ b/trunk/fs/9p/vfs_inode.c @@ -564,13 +564,6 @@ static int v9fs_remove(struct inode *dir, struct dentry *file, int rmdir) return retval; } -static int -v9fs_open_created(struct inode *inode, struct file *file) -{ - return 0; -} - - /** * v9fs_create - Create a file * @v9ses: session information @@ -775,7 +768,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode, /* if we are opening a file, assign the open fid to the file */ if (nd && nd->flags & LOOKUP_OPEN) { - filp = lookup_instantiate_filp(nd, dentry, v9fs_open_created); + filp = lookup_instantiate_filp(nd, dentry, generic_file_open); if (IS_ERR(filp)) { p9_client_clunk(ofid); return PTR_ERR(filp); @@ -834,7 +827,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, /* if we are opening a file, assign the open fid to the file */ if (nd && nd->flags & LOOKUP_OPEN) { - filp = lookup_instantiate_filp(nd, dentry, v9fs_open_created); + filp = lookup_instantiate_filp(nd, dentry, generic_file_open); if (IS_ERR(filp)) { err = PTR_ERR(filp); goto error;