Fix simple_mknod() to handle existing files properly.

[fs/lustre-release.git] / lustre / lib / simple.c

diff --git a/lustre/lib/simple.c b/lustre/lib/simple.c
index 9827eea..20f0829 100644 (file)
--- a/lustre/lib/simple.c
+++ b/lustre/lib/simple.c
@@ -92,13 +92,13 @@ struct dentry *simple_mknod(struct dentry *dir, char *name, int mode)
                 GOTO(out, PTR_ERR(dchild));
 
         if (dchild->d_inode) {
-                if (!S_ISDIR(dchild->d_inode->i_mode))
-                        GOTO(out, err = -ENOTDIR);
+                if (((dchild->d_inode->i_mode ^ mode) & S_IFMT) != 0)
+                        GOTO(out, err = -EEXIST);
 
                 GOTO(out, dchild);
         }
 
-        err = vfs_create(dir->d_inode, dchild, S_IFREG | mode);
+        err = vfs_create(dir->d_inode, dchild, (mode & S_IFMT) | S_IFREG);
         EXIT;
 out:
         up(&dir->d_inode->i_sem);