|
@@ -47,7 +47,7 @@ static int nfs_opendir(struct inode *, struct file *);
|
|
|
static int nfs_closedir(struct inode *, struct file *);
|
|
|
static int nfs_readdir(struct file *, void *, filldir_t);
|
|
|
static struct dentry *nfs_lookup(struct inode *, struct dentry *, unsigned int);
|
|
|
-static int nfs_create(struct inode *, struct dentry *, umode_t, struct nameidata *);
|
|
|
+static int nfs_create(struct inode *, struct dentry *, umode_t, bool);
|
|
|
static int nfs_mkdir(struct inode *, struct dentry *, umode_t);
|
|
|
static int nfs_rmdir(struct inode *, struct dentry *);
|
|
|
static int nfs_unlink(struct inode *, struct dentry *);
|
|
@@ -1589,11 +1589,11 @@ out_error:
|
|
|
* reply path made it appear to have failed.
|
|
|
*/
|
|
|
static int nfs_create(struct inode *dir, struct dentry *dentry,
|
|
|
- umode_t mode, struct nameidata *nd)
|
|
|
+ umode_t mode, bool excl)
|
|
|
{
|
|
|
struct iattr attr;
|
|
|
+ int open_flags = excl ? O_CREAT | O_EXCL : O_CREAT;
|
|
|
int error;
|
|
|
- int open_flags = O_CREAT|O_EXCL;
|
|
|
|
|
|
dfprintk(VFS, "NFS: create(%s/%ld), %s\n",
|
|
|
dir->i_sb->s_id, dir->i_ino, dentry->d_name.name);
|
|
@@ -1601,9 +1601,6 @@ static int nfs_create(struct inode *dir, struct dentry *dentry,
|
|
|
attr.ia_mode = mode;
|
|
|
attr.ia_valid = ATTR_MODE;
|
|
|
|
|
|
- if (nd && !(nd->flags & LOOKUP_EXCL))
|
|
|
- open_flags = O_CREAT;
|
|
|
-
|
|
|
error = NFS_PROTO(dir)->create(dir, dentry, &attr, open_flags);
|
|
|
if (error != 0)
|
|
|
goto out_err;
|