diff options
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index e6d55dc93ffd..6deb2549ead5 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -113,7 +113,7 @@ const struct inode_operations nfs3_dir_inode_operations = { | |||
113 | 113 | ||
114 | static struct file *nfs_atomic_open(struct inode *, struct dentry *, | 114 | static struct file *nfs_atomic_open(struct inode *, struct dentry *, |
115 | struct opendata *, unsigned, umode_t, | 115 | struct opendata *, unsigned, umode_t, |
116 | bool *); | 116 | int *); |
117 | const struct inode_operations nfs4_dir_inode_operations = { | 117 | const struct inode_operations nfs4_dir_inode_operations = { |
118 | .create = nfs_create, | 118 | .create = nfs_create, |
119 | .lookup = nfs_lookup, | 119 | .lookup = nfs_lookup, |
@@ -1389,7 +1389,8 @@ static int do_open(struct inode *inode, struct file *filp) | |||
1389 | 1389 | ||
1390 | static struct file *nfs_finish_open(struct nfs_open_context *ctx, | 1390 | static struct file *nfs_finish_open(struct nfs_open_context *ctx, |
1391 | struct dentry *dentry, | 1391 | struct dentry *dentry, |
1392 | struct opendata *od, unsigned open_flags) | 1392 | struct opendata *od, unsigned open_flags, |
1393 | int *opened) | ||
1393 | { | 1394 | { |
1394 | struct file *filp; | 1395 | struct file *filp; |
1395 | int err; | 1396 | int err; |
@@ -1408,7 +1409,7 @@ static struct file *nfs_finish_open(struct nfs_open_context *ctx, | |||
1408 | } | 1409 | } |
1409 | } | 1410 | } |
1410 | 1411 | ||
1411 | filp = finish_open(od, dentry, do_open); | 1412 | filp = finish_open(od, dentry, do_open, opened); |
1412 | if (!IS_ERR(filp)) | 1413 | if (!IS_ERR(filp)) |
1413 | nfs_file_set_open_context(filp, ctx); | 1414 | nfs_file_set_open_context(filp, ctx); |
1414 | 1415 | ||
@@ -1419,7 +1420,7 @@ out: | |||
1419 | 1420 | ||
1420 | static struct file *nfs_atomic_open(struct inode *dir, struct dentry *dentry, | 1421 | static struct file *nfs_atomic_open(struct inode *dir, struct dentry *dentry, |
1421 | struct opendata *od, unsigned open_flags, | 1422 | struct opendata *od, unsigned open_flags, |
1422 | umode_t mode, bool *created) | 1423 | umode_t mode, int *opened) |
1423 | { | 1424 | { |
1424 | struct nfs_open_context *ctx; | 1425 | struct nfs_open_context *ctx; |
1425 | struct dentry *res; | 1426 | struct dentry *res; |
@@ -1497,7 +1498,7 @@ static struct file *nfs_atomic_open(struct inode *dir, struct dentry *dentry, | |||
1497 | nfs_unblock_sillyrename(dentry->d_parent); | 1498 | nfs_unblock_sillyrename(dentry->d_parent); |
1498 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | 1499 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); |
1499 | 1500 | ||
1500 | filp = nfs_finish_open(ctx, dentry, od, open_flags); | 1501 | filp = nfs_finish_open(ctx, dentry, od, open_flags, opened); |
1501 | 1502 | ||
1502 | dput(res); | 1503 | dput(res); |
1503 | return filp; | 1504 | return filp; |