fs/9p: Always ask new inode in create

[karo-tx-linux.git] / fs / 9p / vfs_inode.c

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 3d8a18ee78e60586b2986cc57c6645807a3a5fba..3bbf705634b2a44265d961ae3ef2394fc2242d3d 100644 (file)
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -454,6 +454,11 @@ static int v9fs_test_inode(struct inode *inode, void *data)
        return 1;
 }
 
+static int v9fs_test_new_inode(struct inode *inode, void *data)
+{
+       return 0;
+}
+
 static int v9fs_set_inode(struct inode *inode,  void *data)
 {
        struct v9fs_inode *v9inode = V9FS_I(inode);
@@ -465,15 +470,22 @@ static int v9fs_set_inode(struct inode *inode,  void *data)
 
 static struct inode *v9fs_qid_iget(struct super_block *sb,
                                   struct p9_qid *qid,
-                                  struct p9_wstat *st)
+                                  struct p9_wstat *st,
+                                  int new)
 {
        int retval, umode;
        unsigned long i_ino;
        struct inode *inode;
        struct v9fs_session_info *v9ses = sb->s_fs_info;
+       int (*test)(struct inode *, void *);
+
+       if (new)
+               test = v9fs_test_new_inode;
+       else
+               test = v9fs_test_inode;
 
        i_ino = v9fs_qid2ino(qid);
-       inode = iget5_locked(sb, i_ino, v9fs_test_inode, v9fs_set_inode, st);
+       inode = iget5_locked(sb, i_ino, test, v9fs_set_inode, st);
        if (!inode)
                return ERR_PTR(-ENOMEM);
        if (!(inode->i_state & I_NEW))
@@ -504,7 +516,7 @@ error:
 
 struct inode *
 v9fs_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
-                   struct super_block *sb)
+                   struct super_block *sb, int new)
 {
        struct p9_wstat *st;
        struct inode *inode = NULL;
@@ -513,7 +525,7 @@ v9fs_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
        if (IS_ERR(st))
                return ERR_CAST(st);
 
-       inode = v9fs_qid_iget(sb, &st->qid, st);
+       inode = v9fs_qid_iget(sb, &st->qid, st, new);
        p9stat_free(st);
        kfree(st);
        return inode;
@@ -615,7 +627,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
        }
 
        /* instantiate inode and assign the unopened fid to the dentry */
-       inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb);
+       inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
        if (IS_ERR(inode)) {
                err = PTR_ERR(inode);
                P9_DPRINTK(P9_DEBUG_VFS, "inode creation failed %d\n", err);