NFS: Remove the redundant file_open entry from struct nfs_rpc_ops
All instances are set to nfs_open(), so we should just remove the redundant indirection. Ditto for the file_release op Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
b22602a673
commit
46cb650c22
|
@ -129,7 +129,7 @@ nfs_file_open(struct inode *inode, struct file *filp)
|
|||
|
||||
nfs_inc_stats(inode, NFSIOS_VFSOPEN);
|
||||
lock_kernel();
|
||||
res = NFS_PROTO(inode)->file_open(inode, filp);
|
||||
res = nfs_open(inode, filp);
|
||||
unlock_kernel();
|
||||
return res;
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ nfs_file_release(struct inode *inode, struct file *filp)
|
|||
if (filp->f_mode & FMODE_WRITE)
|
||||
nfs_wb_all(dentry->d_inode);
|
||||
nfs_inc_stats(inode, NFSIOS_VFSRELEASE);
|
||||
return NFS_PROTO(inode)->file_release(inode, filp);
|
||||
return nfs_release(inode, filp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -816,8 +816,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
|
|||
.write_done = nfs3_write_done,
|
||||
.commit_setup = nfs3_proc_commit_setup,
|
||||
.commit_done = nfs3_commit_done,
|
||||
.file_open = nfs_open,
|
||||
.file_release = nfs_release,
|
||||
.lock = nfs3_proc_lock,
|
||||
.clear_acl_cache = nfs3_forget_cached_acls,
|
||||
};
|
||||
|
|
|
@ -3714,8 +3714,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
|
|||
.write_done = nfs4_write_done,
|
||||
.commit_setup = nfs4_proc_commit_setup,
|
||||
.commit_done = nfs4_commit_done,
|
||||
.file_open = nfs_open,
|
||||
.file_release = nfs_release,
|
||||
.lock = nfs4_proc_lock,
|
||||
.clear_acl_cache = nfs4_zap_acl_attr,
|
||||
};
|
||||
|
|
|
@ -655,8 +655,6 @@ const struct nfs_rpc_ops nfs_v2_clientops = {
|
|||
.write_setup = nfs_proc_write_setup,
|
||||
.write_done = nfs_write_done,
|
||||
.commit_setup = nfs_proc_commit_setup,
|
||||
.file_open = nfs_open,
|
||||
.file_release = nfs_release,
|
||||
.lock = nfs_proc_lock,
|
||||
.lock_check_bounds = nfs_lock_check_bounds,
|
||||
};
|
||||
|
|
|
@ -829,8 +829,6 @@ struct nfs_rpc_ops {
|
|||
int (*write_done) (struct rpc_task *, struct nfs_write_data *);
|
||||
void (*commit_setup) (struct nfs_write_data *, struct rpc_message *);
|
||||
int (*commit_done) (struct rpc_task *, struct nfs_write_data *);
|
||||
int (*file_open) (struct inode *, struct file *);
|
||||
int (*file_release) (struct inode *, struct file *);
|
||||
int (*lock)(struct file *, int, struct file_lock *);
|
||||
int (*lock_check_bounds)(const struct file_lock *);
|
||||
void (*clear_acl_cache)(struct inode *);
|
||||
|
|
Loading…
Reference in New Issue