Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aff8d8dc authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove nfs_release() 



And call nfs_file_clear_open_context() directly.  This makes it obvious
that nfs_file_release() will always return 0.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ae09c31f

fs/nfs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ nfs_file_release(struct inode *inode, struct file *filp) 
	dprintk("NFS: release(%pD2)\n", filp);



	nfs_inc_stats(inode, NFSIOS_VFSRELEASE);

	return nfs_release(inode, filp);

	nfs_file_clear_open_context(filp);

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_file_release);

fs/nfs/inode.c

+1 −7
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_c 
	return ctx;

}



static void nfs_file_clear_open_context(struct file *filp)

void nfs_file_clear_open_context(struct file *filp)

{

	struct nfs_open_context *ctx = nfs_file_open_context(filp);
@@ -919,12 +919,6 @@ int nfs_open(struct inode *inode, struct file *filp) 
	return 0;

}



int nfs_release(struct inode *inode, struct file *filp)

{

	nfs_file_clear_open_context(filp);

	return 0;

}



/*

 * This function is called whenever some part of NFS notices that

 * the cached attributes have to be refreshed.

include/linux/nfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *); 
extern void nfs_access_set_mask(struct nfs_access_entry *, u32);

extern int nfs_permission(struct inode *, int);

extern int nfs_open(struct inode *, struct file *);

extern int nfs_release(struct inode *, struct file *);

extern int nfs_attribute_timeout(struct inode *inode);

extern int nfs_attribute_cache_expired(struct inode *inode);

extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
@@ -371,6 +370,7 @@ extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struc 
extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, fmode_t f_mode);

extern void nfs_inode_attach_open_context(struct nfs_open_context *ctx);

extern void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx);

extern void nfs_file_clear_open_context(struct file *flip);

extern struct nfs_lock_context *nfs_get_lock_context(struct nfs_open_context *ctx);

extern void nfs_put_lock_context(struct nfs_lock_context *l_ctx);

extern u64 nfs_compat_user_ino64(u64 fileid);