NFS: Let opened is optional in _nfs4_do_open
Subsystems (2)
PATCH 5/5 NFS: Let opened is optional in _nfs4_do_open
Signed-off-by Kinglong Mee <[email protected]>
--- fs/nfs/nfs4file.c | 3 +-- fs/nfs/nfs4proc.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-)
fs/nfs/nfs4file.c +1 -2
@@ -27,7 +27,6 @@ nfs4_file_open(struct inode *inode, struct file *filp)struct inode *dir;unsigned openflags = filp->f_flags;struct iattr attr; -int opened =0 ;int err;/*
@@ -66,7 +65,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)nfs_sync_inode (inode); } - inode =NFS_PROTO (dir)->open_context (dir, ctx, openflags, &attr, &opened); + inode =NFS_PROTO (dir)->open_context (dir, ctx, openflags, &attr,NULL );if (IS_ERR (inode)) { err =PTR_ERR (inode);switch (err) {
fs/nfs/nfs4proc.c +2 -3
@@ -2426,7 +2426,7 @@ static int _nfs4_do_open(struct inode *dir,nfs_setsecurity (state->inode, opendata->o_res.f_attr, olabel); } } -if (opendata->file_created) +if (opened && opendata->file_created) *opened |=FILE_CREATED ;if (pnfs_use_threshold (ctx_th, opendata->f_attr.mdsthreshold, server)) {
@@ -3539,7 +3539,6 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,struct nfs4_label l, *ilabel =NULL ;struct nfs_open_context *ctx;struct nfs4_state *state; -int opened =0 ;int status =0 ; ctx =alloc_nfs_open_context (dentry,FMODE_READ );
@@ -3549,7 +3548,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, ilabel =nfs4_label_init_security (dir, dentry, sattr, &l); sattr->ia_mode &= ~current_umask (); - state =nfs4_do_open (dir, ctx, flags, sattr, ilabel, &opened); + state =nfs4_do_open (dir, ctx, flags, sattr, ilabel,NULL );if (IS_ERR (state)) { status =PTR_ERR (state); goto out;
Signature · 1 line
2.4.3
Quoted 2 lines · Kinglong Mee
Signed-off-by Kinglong Mee <[email protected]>
Please add a changelog explaining why we need to apply this patch.
Quoted 5 lines · Trond Myklebust
Quoted 2 lines · Kinglong Mee
Signed-off-by Kinglong Mee <[email protected]>Please add a changelog explaining why we need to apply this patch.
OK, I will update it later.
thanks,
Kinglong Mee