Skip to content

L
linux
Commit a310082f authored by David Howells's avatar David Howells
Browse files
Options

afs: Rename struct afs_fs_cursor to afs_operation 

As a prelude to implementing asynchronous fileserver operations in the afs
filesystem, rename struct afs_fs_cursor to afs_operation.

This struct is going to form the core of the operation management and is
going to acquire more members in later.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 7126ead9
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 278 deletions
fs/afs/dir.c
View file @ a310082f
...@@ -643,7 +643,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry, ...@@ -643,7 +643,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,
struct afs_super_info *as = dir->i_sb->s_fs_info; struct afs_super_info *as = dir->i_sb->s_fs_info;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_iget_data iget_data; struct afs_iget_data iget_data;
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_server *server; struct afs_server *server;
struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode; struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode;
struct inode *inode = NULL, *ti; struct inode *inode = NULL, *ti;
...@@ -1220,7 +1220,7 @@ void afs_d_release(struct dentry *dentry) ...@@ -1220,7 +1220,7 @@ void afs_d_release(struct dentry *dentry)
/* /*
* Create a new inode for create/mkdir/symlink * Create a new inode for create/mkdir/symlink
*/ */
static void afs_vnode_new_inode(struct afs_fs_cursor *fc, static void afs_vnode_new_inode(struct afs_operation *fc,
struct dentry *new_dentry, struct dentry *new_dentry,
struct afs_iget_data *new_data, struct afs_iget_data *new_data,
struct afs_status_cb *new_scb) struct afs_status_cb *new_scb)
...@@ -1248,7 +1248,7 @@ static void afs_vnode_new_inode(struct afs_fs_cursor *fc, ...@@ -1248,7 +1248,7 @@ static void afs_vnode_new_inode(struct afs_fs_cursor *fc,
d_instantiate(new_dentry, inode); d_instantiate(new_dentry, inode);
} }
static void afs_prep_for_new_inode(struct afs_fs_cursor *fc, static void afs_prep_for_new_inode(struct afs_operation *fc,
struct afs_iget_data *iget_data) struct afs_iget_data *iget_data)
{ {
iget_data->volume = fc->vnode->volume; iget_data->volume = fc->vnode->volume;
...@@ -1261,7 +1261,7 @@ static void afs_prep_for_new_inode(struct afs_fs_cursor *fc, ...@@ -1261,7 +1261,7 @@ static void afs_prep_for_new_inode(struct afs_fs_cursor *fc,
* number derived from the result of the operation. It doesn't matter if * number derived from the result of the operation. It doesn't matter if
* d_fsdata goes backwards as we'll just revalidate. * d_fsdata goes backwards as we'll just revalidate.
*/ */
static void afs_update_dentry_version(struct afs_fs_cursor *fc, static void afs_update_dentry_version(struct afs_operation *fc,
struct dentry *dentry, struct dentry *dentry,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
...@@ -1277,7 +1277,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ...@@ -1277,7 +1277,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
{ {
struct afs_iget_data iget_data; struct afs_iget_data iget_data;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_vnode *dvnode = AFS_FS_I(dir); struct afs_vnode *dvnode = AFS_FS_I(dir);
struct key *key; struct key *key;
afs_dataversion_t data_version; afs_dataversion_t data_version;
...@@ -1367,7 +1367,7 @@ static void afs_dir_remove_subdir(struct dentry *dentry) ...@@ -1367,7 +1367,7 @@ static void afs_dir_remove_subdir(struct dentry *dentry)
static int afs_rmdir(struct inode *dir, struct dentry *dentry) static int afs_rmdir(struct inode *dir, struct dentry *dentry)
{ {
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode = NULL; struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode = NULL;
struct key *key; struct key *key;
afs_dataversion_t data_version; afs_dataversion_t data_version;
...@@ -1483,7 +1483,7 @@ static int afs_dir_remove_link(struct afs_vnode *dvnode, struct dentry *dentry, ...@@ -1483,7 +1483,7 @@ static int afs_dir_remove_link(struct afs_vnode *dvnode, struct dentry *dentry,
*/ */
static int afs_unlink(struct inode *dir, struct dentry *dentry) static int afs_unlink(struct inode *dir, struct dentry *dentry)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *dvnode = AFS_FS_I(dir); struct afs_vnode *dvnode = AFS_FS_I(dir);
struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry)); struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry));
...@@ -1588,7 +1588,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ...@@ -1588,7 +1588,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
bool excl) bool excl)
{ {
struct afs_iget_data iget_data; struct afs_iget_data iget_data;
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *dvnode = AFS_FS_I(dir); struct afs_vnode *dvnode = AFS_FS_I(dir);
struct key *key; struct key *key;
...@@ -1666,7 +1666,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ...@@ -1666,7 +1666,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
static int afs_link(struct dentry *from, struct inode *dir, static int afs_link(struct dentry *from, struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *dvnode = AFS_FS_I(dir); struct afs_vnode *dvnode = AFS_FS_I(dir);
struct afs_vnode *vnode = AFS_FS_I(d_inode(from)); struct afs_vnode *vnode = AFS_FS_I(d_inode(from));
...@@ -1755,7 +1755,7 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, ...@@ -1755,7 +1755,7 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry,
const char *content) const char *content)
{ {
struct afs_iget_data iget_data; struct afs_iget_data iget_data;
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *dvnode = AFS_FS_I(dir); struct afs_vnode *dvnode = AFS_FS_I(dir);
struct key *key; struct key *key;
...@@ -1837,7 +1837,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1837,7 +1837,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry, struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags) unsigned int flags)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *orig_dvnode, *new_dvnode, *vnode; struct afs_vnode *orig_dvnode, *new_dvnode, *vnode;
struct dentry *tmp = NULL, *rehash = NULL; struct dentry *tmp = NULL, *rehash = NULL;
......
fs/afs/dir_silly.c
View file @ a310082f
...@@ -19,7 +19,7 @@ static int afs_do_silly_rename(struct afs_vnode *dvnode, struct afs_vnode *vnode ...@@ -19,7 +19,7 @@ static int afs_do_silly_rename(struct afs_vnode *dvnode, struct afs_vnode *vnode
struct dentry *old, struct dentry *new, struct dentry *old, struct dentry *new,
struct key *key) struct key *key)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
afs_dataversion_t dir_data_version; afs_dataversion_t dir_data_version;
int ret = -ERESTARTSYS; int ret = -ERESTARTSYS;
...@@ -145,7 +145,7 @@ int afs_sillyrename(struct afs_vnode *dvnode, struct afs_vnode *vnode, ...@@ -145,7 +145,7 @@ int afs_sillyrename(struct afs_vnode *dvnode, struct afs_vnode *vnode,
static int afs_do_silly_unlink(struct afs_vnode *dvnode, struct afs_vnode *vnode, static int afs_do_silly_unlink(struct afs_vnode *dvnode, struct afs_vnode *vnode,
struct dentry *dentry, struct key *key) struct dentry *dentry, struct key *key)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
int ret = -ERESTARTSYS; int ret = -ERESTARTSYS;
......
fs/afs/file.c
View file @ a310082f
...@@ -225,7 +225,7 @@ static void afs_file_readpage_read_complete(struct page *page, ...@@ -225,7 +225,7 @@ static void afs_file_readpage_read_complete(struct page *page,
*/ */
int afs_fetch_data(struct afs_vnode *vnode, struct key *key, struct afs_read *req) int afs_fetch_data(struct afs_vnode *vnode, struct key *key, struct afs_read *req)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
int ret; int ret;
......
fs/afs/flock.c
View file @ a310082f
...@@ -179,7 +179,7 @@ static int afs_set_lock(struct afs_vnode *vnode, struct key *key, ...@@ -179,7 +179,7 @@ static int afs_set_lock(struct afs_vnode *vnode, struct key *key,
afs_lock_type_t type) afs_lock_type_t type)
{ {
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
int ret; int ret;
_enter("%s{%llx:%llu.%u},%x,%u", _enter("%s{%llx:%llu.%u},%x,%u",
...@@ -216,7 +216,7 @@ static int afs_set_lock(struct afs_vnode *vnode, struct key *key, ...@@ -216,7 +216,7 @@ static int afs_set_lock(struct afs_vnode *vnode, struct key *key,
static int afs_extend_lock(struct afs_vnode *vnode, struct key *key) static int afs_extend_lock(struct afs_vnode *vnode, struct key *key)
{ {
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
int ret; int ret;
_enter("%s{%llx:%llu.%u},%x", _enter("%s{%llx:%llu.%u},%x",
...@@ -253,7 +253,7 @@ static int afs_extend_lock(struct afs_vnode *vnode, struct key *key) ...@@ -253,7 +253,7 @@ static int afs_extend_lock(struct afs_vnode *vnode, struct key *key)
static int afs_release_lock(struct afs_vnode *vnode, struct key *key) static int afs_release_lock(struct afs_vnode *vnode, struct key *key)
{ {
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
int ret; int ret;
_enter("%s{%llx:%llu.%u},%x", _enter("%s{%llx:%llu.%u},%x",
......
fs/afs/fsclient.c
View file @ a310082f
...@@ -272,7 +272,7 @@ static const struct afs_call_type afs_RXFSFetchStatus_vnode = { ...@@ -272,7 +272,7 @@ static const struct afs_call_type afs_RXFSFetchStatus_vnode = {
/* /*
* fetch the status information for a file * fetch the status information for a file
*/ */
int afs_fs_fetch_file_status(struct afs_fs_cursor *fc, struct afs_status_cb *scb, int afs_fs_fetch_file_status(struct afs_operation *fc, struct afs_status_cb *scb,
struct afs_volsync *volsync) struct afs_volsync *volsync)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -470,7 +470,7 @@ static const struct afs_call_type afs_RXFSFetchData64 = { ...@@ -470,7 +470,7 @@ static const struct afs_call_type afs_RXFSFetchData64 = {
/* /*
* fetch data from a very large file * fetch data from a very large file
*/ */
static int afs_fs_fetch_data64(struct afs_fs_cursor *fc, static int afs_fs_fetch_data64(struct afs_operation *fc,
struct afs_status_cb *scb, struct afs_status_cb *scb,
struct afs_read *req) struct afs_read *req)
{ {
...@@ -511,7 +511,7 @@ static int afs_fs_fetch_data64(struct afs_fs_cursor *fc, ...@@ -511,7 +511,7 @@ static int afs_fs_fetch_data64(struct afs_fs_cursor *fc,
/* /*
* fetch data from a file * fetch data from a file
*/ */
int afs_fs_fetch_data(struct afs_fs_cursor *fc, int afs_fs_fetch_data(struct afs_operation *fc,
struct afs_status_cb *scb, struct afs_status_cb *scb,
struct afs_read *req) struct afs_read *req)
{ {
...@@ -599,7 +599,7 @@ static const struct afs_call_type afs_RXFSMakeDir = { ...@@ -599,7 +599,7 @@ static const struct afs_call_type afs_RXFSMakeDir = {
/* /*
* create a file or make a directory * create a file or make a directory
*/ */
int afs_fs_create(struct afs_fs_cursor *fc, int afs_fs_create(struct afs_operation *fc,
const char *name, const char *name,
umode_t mode, umode_t mode,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
...@@ -707,7 +707,7 @@ static const struct afs_call_type afs_RXFSRemoveDir = { ...@@ -707,7 +707,7 @@ static const struct afs_call_type afs_RXFSRemoveDir = {
/* /*
* remove a file or directory * remove a file or directory
*/ */
int afs_fs_remove(struct afs_fs_cursor *fc, struct afs_vnode *vnode, int afs_fs_remove(struct afs_operation *fc, struct afs_vnode *vnode,
const char *name, bool isdir, struct afs_status_cb *dvnode_scb) const char *name, bool isdir, struct afs_status_cb *dvnode_scb)
{ {
struct afs_vnode *dvnode = fc->vnode; struct afs_vnode *dvnode = fc->vnode;
...@@ -792,7 +792,7 @@ static const struct afs_call_type afs_RXFSLink = { ...@@ -792,7 +792,7 @@ static const struct afs_call_type afs_RXFSLink = {
/* /*
* make a hard link * make a hard link
*/ */
int afs_fs_link(struct afs_fs_cursor *fc, struct afs_vnode *vnode, int afs_fs_link(struct afs_operation *fc, struct afs_vnode *vnode,
const char *name, const char *name,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
struct afs_status_cb *vnode_scb) struct afs_status_cb *vnode_scb)
...@@ -882,7 +882,7 @@ static const struct afs_call_type afs_RXFSSymlink = { ...@@ -882,7 +882,7 @@ static const struct afs_call_type afs_RXFSSymlink = {
/* /*
* create a symbolic link * create a symbolic link
*/ */
int afs_fs_symlink(struct afs_fs_cursor *fc, int afs_fs_symlink(struct afs_operation *fc,
const char *name, const char *name,
const char *contents, const char *contents,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
...@@ -990,7 +990,7 @@ static const struct afs_call_type afs_RXFSRename = { ...@@ -990,7 +990,7 @@ static const struct afs_call_type afs_RXFSRename = {
/* /*
* Rename/move a file or directory. * Rename/move a file or directory.
*/ */
int afs_fs_rename(struct afs_fs_cursor *fc, int afs_fs_rename(struct afs_operation *fc,
const char *orig_name, const char *orig_name,
struct afs_vnode *new_dvnode, struct afs_vnode *new_dvnode,
const char *new_name, const char *new_name,
...@@ -1105,7 +1105,7 @@ static const struct afs_call_type afs_RXFSStoreData64 = { ...@@ -1105,7 +1105,7 @@ static const struct afs_call_type afs_RXFSStoreData64 = {
/* /*
* store a set of pages to a very large file * store a set of pages to a very large file
*/ */
static int afs_fs_store_data64(struct afs_fs_cursor *fc, static int afs_fs_store_data64(struct afs_operation *fc,
struct address_space *mapping, struct address_space *mapping,
pgoff_t first, pgoff_t last, pgoff_t first, pgoff_t last,
unsigned offset, unsigned to, unsigned offset, unsigned to,
...@@ -1165,7 +1165,7 @@ static int afs_fs_store_data64(struct afs_fs_cursor *fc, ...@@ -1165,7 +1165,7 @@ static int afs_fs_store_data64(struct afs_fs_cursor *fc,
/* /*
* store a set of pages * store a set of pages
*/ */
int afs_fs_store_data(struct afs_fs_cursor *fc, struct address_space *mapping, int afs_fs_store_data(struct afs_operation *fc, struct address_space *mapping,
pgoff_t first, pgoff_t last, pgoff_t first, pgoff_t last,
unsigned offset, unsigned to, unsigned offset, unsigned to,
struct afs_status_cb *scb) struct afs_status_cb *scb)
...@@ -1291,7 +1291,7 @@ static const struct afs_call_type afs_RXFSStoreData64_as_Status = { ...@@ -1291,7 +1291,7 @@ static const struct afs_call_type afs_RXFSStoreData64_as_Status = {
* set the attributes on a very large file, using FS.StoreData rather than * set the attributes on a very large file, using FS.StoreData rather than
* FS.StoreStatus so as to alter the file size also * FS.StoreStatus so as to alter the file size also
*/ */
static int afs_fs_setattr_size64(struct afs_fs_cursor *fc, struct iattr *attr, static int afs_fs_setattr_size64(struct afs_operation *fc, struct iattr *attr,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1340,7 +1340,7 @@ static int afs_fs_setattr_size64(struct afs_fs_cursor *fc, struct iattr *attr, ...@@ -1340,7 +1340,7 @@ static int afs_fs_setattr_size64(struct afs_fs_cursor *fc, struct iattr *attr,
* set the attributes on a file, using FS.StoreData rather than FS.StoreStatus * set the attributes on a file, using FS.StoreData rather than FS.StoreStatus
* so as to alter the file size also * so as to alter the file size also
*/ */
static int afs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr, static int afs_fs_setattr_size(struct afs_operation *fc, struct iattr *attr,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1388,7 +1388,7 @@ static int afs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr, ...@@ -1388,7 +1388,7 @@ static int afs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr,
* set the attributes on a file, using FS.StoreData if there's a change in file * set the attributes on a file, using FS.StoreData if there's a change in file
* size, and FS.StoreStatus otherwise * size, and FS.StoreStatus otherwise
*/ */
int afs_fs_setattr(struct afs_fs_cursor *fc, struct iattr *attr, int afs_fs_setattr(struct afs_operation *fc, struct iattr *attr,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1569,7 +1569,7 @@ static const struct afs_call_type afs_RXFSGetVolumeStatus = { ...@@ -1569,7 +1569,7 @@ static const struct afs_call_type afs_RXFSGetVolumeStatus = {
/* /*
* fetch the status of a volume * fetch the status of a volume
*/ */
int afs_fs_get_volume_status(struct afs_fs_cursor *fc, int afs_fs_get_volume_status(struct afs_operation *fc,
struct afs_volume_status *vs) struct afs_volume_status *vs)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1659,7 +1659,7 @@ static const struct afs_call_type afs_RXFSReleaseLock = { ...@@ -1659,7 +1659,7 @@ static const struct afs_call_type afs_RXFSReleaseLock = {
/* /*
* Set a lock on a file * Set a lock on a file
*/ */
int afs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type, int afs_fs_set_lock(struct afs_operation *fc, afs_lock_type_t type,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1698,7 +1698,7 @@ int afs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type, ...@@ -1698,7 +1698,7 @@ int afs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type,
/* /*
* extend a lock on a file * extend a lock on a file
*/ */
int afs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) int afs_fs_extend_lock(struct afs_operation *fc, struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
struct afs_call *call; struct afs_call *call;
...@@ -1735,7 +1735,7 @@ int afs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) ...@@ -1735,7 +1735,7 @@ int afs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb)
/* /*
* release a lock on a file * release a lock on a file
*/ */
int afs_fs_release_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) int afs_fs_release_lock(struct afs_operation *fc, struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
struct afs_call *call; struct afs_call *call;
...@@ -1941,7 +1941,7 @@ static const struct afs_call_type afs_RXFSFetchStatus = { ...@@ -1941,7 +1941,7 @@ static const struct afs_call_type afs_RXFSFetchStatus = {
/* /*
* Fetch the status information for a fid without needing a vnode handle. * Fetch the status information for a fid without needing a vnode handle.
*/ */
int afs_fs_fetch_status(struct afs_fs_cursor *fc, int afs_fs_fetch_status(struct afs_operation *fc,
struct afs_net *net, struct afs_net *net,
struct afs_fid *fid, struct afs_fid *fid,
struct afs_status_cb *scb, struct afs_status_cb *scb,
...@@ -2101,7 +2101,7 @@ static const struct afs_call_type afs_RXFSInlineBulkStatus = { ...@@ -2101,7 +2101,7 @@ static const struct afs_call_type afs_RXFSInlineBulkStatus = {
/* /*
* Fetch the status information for up to 50 files * Fetch the status information for up to 50 files
*/ */
int afs_fs_inline_bulk_status(struct afs_fs_cursor *fc, int afs_fs_inline_bulk_status(struct afs_operation *fc,
struct afs_net *net, struct afs_net *net,
struct afs_fid *fids, struct afs_fid *fids,
struct afs_status_cb *statuses, struct afs_status_cb *statuses,
...@@ -2234,7 +2234,7 @@ static const struct afs_call_type afs_RXFSFetchACL = { ...@@ -2234,7 +2234,7 @@ static const struct afs_call_type afs_RXFSFetchACL = {
/* /*
* Fetch the ACL for a file. * Fetch the ACL for a file.
*/ */
struct afs_acl *afs_fs_fetch_acl(struct afs_fs_cursor *fc, struct afs_acl *afs_fs_fetch_acl(struct afs_operation *fc,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -2303,7 +2303,7 @@ static const struct afs_call_type afs_RXFSStoreACL = { ...@@ -2303,7 +2303,7 @@ static const struct afs_call_type afs_RXFSStoreACL = {
/* /*
* Fetch the ACL for a file. * Fetch the ACL for a file.
*/ */
int afs_fs_store_acl(struct afs_fs_cursor *fc, const struct afs_acl *acl, int afs_fs_store_acl(struct afs_operation *fc, const struct afs_acl *acl,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
......
fs/afs/inode.c
View file @ a310082f
...@@ -161,7 +161,7 @@ static int afs_inode_init_from_status(struct afs_vnode *vnode, struct key *key, ...@@ -161,7 +161,7 @@ static int afs_inode_init_from_status(struct afs_vnode *vnode, struct key *key,
/* /*
* Update the core inode struct from a returned status record. * Update the core inode struct from a returned status record.
*/ */
static void afs_apply_status(struct afs_fs_cursor *fc, static void afs_apply_status(struct afs_operation *fc,
struct afs_vnode *vnode, struct afs_vnode *vnode,
struct afs_status_cb *scb, struct afs_status_cb *scb,
const afs_dataversion_t *expected_version) const afs_dataversion_t *expected_version)
...@@ -243,7 +243,7 @@ static void afs_apply_status(struct afs_fs_cursor *fc, ...@@ -243,7 +243,7 @@ static void afs_apply_status(struct afs_fs_cursor *fc,
/* /*
* Apply a callback to a vnode. * Apply a callback to a vnode.
*/ */
static void afs_apply_callback(struct afs_fs_cursor *fc, static void afs_apply_callback(struct afs_operation *fc,
struct afs_vnode *vnode, struct afs_vnode *vnode,
struct afs_status_cb *scb, struct afs_status_cb *scb,
unsigned int cb_break) unsigned int cb_break)
...@@ -267,7 +267,7 @@ static void afs_apply_callback(struct afs_fs_cursor *fc, ...@@ -267,7 +267,7 @@ static void afs_apply_callback(struct afs_fs_cursor *fc,
* Apply the received status and callback to an inode all in the same critical * Apply the received status and callback to an inode all in the same critical
* section to avoid races with afs_validate(). * section to avoid races with afs_validate().
*/ */
void afs_vnode_commit_status(struct afs_fs_cursor *fc, void afs_vnode_commit_status(struct afs_operation *fc,
struct afs_vnode *vnode, struct afs_vnode *vnode,
unsigned int cb_break, unsigned int cb_break,
const afs_dataversion_t *expected_version, const afs_dataversion_t *expected_version,
...@@ -304,7 +304,7 @@ int afs_fetch_status(struct afs_vnode *vnode, struct key *key, bool is_new, ...@@ -304,7 +304,7 @@ int afs_fetch_status(struct afs_vnode *vnode, struct key *key, bool is_new,
afs_access_t *_caller_access) afs_access_t *_caller_access)
{ {
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_fs_cursor fc; struct afs_operation fc;
int ret; int ret;
_enter("%s,{%llx:%llu.%u,S=%lx}", _enter("%s,{%llx:%llu.%u,S=%lx}",
...@@ -813,7 +813,7 @@ void afs_evict_inode(struct inode *inode) ...@@ -813,7 +813,7 @@ void afs_evict_inode(struct inode *inode)
*/ */
int afs_setattr(struct dentry *dentry, struct iattr *attr) int afs_setattr(struct dentry *dentry, struct iattr *attr)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry)); struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry));
struct key *key; struct key *key;
......
fs/afs/internal.h
View file @ a310082f
...@@ -766,7 +766,7 @@ struct afs_vl_cursor { ...@@ -766,7 +766,7 @@ struct afs_vl_cursor {
/* /*
* Cursor for iterating over a set of fileservers. * Cursor for iterating over a set of fileservers.
*/ */
struct afs_fs_cursor { struct afs_operation {
const struct afs_call_type *type; /* Type of call done */ const struct afs_call_type *type; /* Type of call done */
struct afs_addr_cursor ac; struct afs_addr_cursor ac;
struct afs_vnode *vnode; struct afs_vnode *vnode;
...@@ -779,13 +779,13 @@ struct afs_fs_cursor { ...@@ -779,13 +779,13 @@ struct afs_fs_cursor {
short index; /* Current server */ short index; /* Current server */
short error; short error;
unsigned short flags; unsigned short flags;
#define AFS_FS_CURSOR_STOP 0x0001 /* Set to cease iteration */ #define AFS_OPERATION_STOP 0x0001 /* Set to cease iteration */
#define AFS_FS_CURSOR_VBUSY 0x0002 /* Set if seen VBUSY */ #define AFS_OPERATION_VBUSY 0x0002 /* Set if seen VBUSY */
#define AFS_FS_CURSOR_VMOVED 0x0004 /* Set if seen VMOVED */ #define AFS_OPERATION_VMOVED 0x0004 /* Set if seen VMOVED */
#define AFS_FS_CURSOR_VNOVOL 0x0008 /* Set if seen VNOVOL */ #define AFS_OPERATION_VNOVOL 0x0008 /* Set if seen VNOVOL */
#define AFS_FS_CURSOR_CUR_ONLY 0x0010 /* Set if current server only (file lock held) */ #define AFS_OPERATION_CUR_ONLY 0x0010 /* Set if current server only (file lock held) */
#define AFS_FS_CURSOR_NO_VSLEEP 0x0020 /* Set to prevent sleep on VBUSY, VOFFLINE, ... */ #define AFS_OPERATION_NO_VSLEEP 0x0020 /* Set to prevent sleep on VBUSY, VOFFLINE, ... */
#define AFS_FS_CURSOR_INTR 0x0040 /* Set if op is interruptible */ #define AFS_OPERATION_INTR 0x0040 /* Set if op is interruptible */
unsigned short nr_iterations; /* Number of server iterations */ unsigned short nr_iterations; /* Number of server iterations */
}; };
...@@ -958,35 +958,35 @@ extern int afs_flock(struct file *, int, struct file_lock *); ...@@ -958,35 +958,35 @@ extern int afs_flock(struct file *, int, struct file_lock *);
/* /*
* fsclient.c * fsclient.c
*/ */
extern int afs_fs_fetch_file_status(struct afs_fs_cursor *, struct afs_status_cb *, extern int afs_fs_fetch_file_status(struct afs_operation *, struct afs_status_cb *,
struct afs_volsync *); struct afs_volsync *);
extern int afs_fs_fetch_data(struct afs_fs_cursor *, struct afs_status_cb *, struct afs_read *); extern int afs_fs_fetch_data(struct afs_operation *, struct afs_status_cb *, struct afs_read *);
extern int afs_fs_create(struct afs_fs_cursor *, const char *, umode_t, extern int afs_fs_create(struct afs_operation *, const char *, umode_t,
struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *); struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *);
extern int afs_fs_remove(struct afs_fs_cursor *, struct afs_vnode *, const char *, bool, extern int afs_fs_remove(struct afs_operation *, struct afs_vnode *, const char *, bool,
struct afs_status_cb *); struct afs_status_cb *);
extern int afs_fs_link(struct afs_fs_cursor *, struct afs_vnode *, const char *, extern int afs_fs_link(struct afs_operation *, struct afs_vnode *, const char *,
struct afs_status_cb *, struct afs_status_cb *); struct afs_status_cb *, struct afs_status_cb *);
extern int afs_fs_symlink(struct afs_fs_cursor *, const char *, const char *, extern int afs_fs_symlink(struct afs_operation *, const char *, const char *,
struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *); struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *);
extern int afs_fs_rename(struct afs_fs_cursor *, const char *, extern int afs_fs_rename(struct afs_operation *, const char *,
struct afs_vnode *, const char *, struct afs_vnode *, const char *,
struct afs_status_cb *, struct afs_status_cb *); struct afs_status_cb *, struct afs_status_cb *);
extern int afs_fs_store_data(struct afs_fs_cursor *, struct address_space *, extern int afs_fs_store_data(struct afs_operation *, struct address_space *,
pgoff_t, pgoff_t, unsigned, unsigned, struct afs_status_cb *); pgoff_t, pgoff_t, unsigned, unsigned, struct afs_status_cb *);
extern int afs_fs_setattr(struct afs_fs_cursor *, struct iattr *, struct afs_status_cb *); extern int afs_fs_setattr(struct afs_operation *, struct iattr *, struct afs_status_cb *);
extern int afs_fs_get_volume_status(struct afs_fs_cursor *, struct afs_volume_status *); extern int afs_fs_get_volume_status(struct afs_operation *, struct afs_volume_status *);
extern int afs_fs_set_lock(struct afs_fs_cursor *, afs_lock_type_t, struct afs_status_cb *); extern int afs_fs_set_lock(struct afs_operation *, afs_lock_type_t, struct afs_status_cb *);
extern int afs_fs_extend_lock(struct afs_fs_cursor *, struct afs_status_cb *); extern int afs_fs_extend_lock(struct afs_operation *, struct afs_status_cb *);
extern int afs_fs_release_lock(struct afs_fs_cursor *, struct afs_status_cb *); extern int afs_fs_release_lock(struct afs_operation *, struct afs_status_cb *);
extern int afs_fs_give_up_all_callbacks(struct afs_net *, struct afs_server *, extern int afs_fs_give_up_all_callbacks(struct afs_net *, struct afs_server *,
struct afs_addr_cursor *, struct key *); struct afs_addr_cursor *, struct key *);
extern bool afs_fs_get_capabilities(struct afs_net *, struct afs_server *, extern bool afs_fs_get_capabilities(struct afs_net *, struct afs_server *,
struct afs_addr_cursor *, struct key *); struct afs_addr_cursor *, struct key *);
extern int afs_fs_inline_bulk_status(struct afs_fs_cursor *, struct afs_net *, extern int afs_fs_inline_bulk_status(struct afs_operation *, struct afs_net *,
struct afs_fid *, struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *,
unsigned int, struct afs_volsync *); unsigned int, struct afs_volsync *);
extern int afs_fs_fetch_status(struct afs_fs_cursor *, struct afs_net *, extern int afs_fs_fetch_status(struct afs_operation *, struct afs_net *,
struct afs_fid *, struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *,
struct afs_volsync *); struct afs_volsync *);
...@@ -995,8 +995,8 @@ struct afs_acl { ...@@ -995,8 +995,8 @@ struct afs_acl {
u8 data[]; u8 data[];
}; };
extern struct afs_acl *afs_fs_fetch_acl(struct afs_fs_cursor *, struct afs_status_cb *); extern struct afs_acl *afs_fs_fetch_acl(struct afs_operation *, struct afs_status_cb *);
extern int afs_fs_store_acl(struct afs_fs_cursor *, const struct afs_acl *, extern int afs_fs_store_acl(struct afs_operation *, const struct afs_acl *,
struct afs_status_cb *); struct afs_status_cb *);
/* /*
...@@ -1010,7 +1010,7 @@ extern void afs_fs_probe_dispatcher(struct work_struct *); ...@@ -1010,7 +1010,7 @@ extern void afs_fs_probe_dispatcher(struct work_struct *);
/* /*
* inode.c * inode.c
*/ */
extern void afs_vnode_commit_status(struct afs_fs_cursor *, extern void afs_vnode_commit_status(struct afs_operation *,
struct afs_vnode *, struct afs_vnode *,
unsigned int, unsigned int,
const afs_dataversion_t *, const afs_dataversion_t *,
...@@ -1109,11 +1109,11 @@ static inline void afs_put_sysnames(struct afs_sysnames *sysnames) {} ...@@ -1109,11 +1109,11 @@ static inline void afs_put_sysnames(struct afs_sysnames *sysnames) {}
/* /*
* rotate.c * rotate.c
*/ */
extern bool afs_begin_vnode_operation(struct afs_fs_cursor *, struct afs_vnode *, extern bool afs_begin_vnode_operation(struct afs_operation *, struct afs_vnode *,
struct key *, bool); struct key *, bool);
extern bool afs_select_fileserver(struct afs_fs_cursor *); extern bool afs_select_fileserver(struct afs_operation *);
extern bool afs_select_current_fileserver(struct afs_fs_cursor *); extern bool afs_select_current_fileserver(struct afs_operation *);
extern int afs_end_vnode_operation(struct afs_fs_cursor *); extern int afs_end_vnode_operation(struct afs_operation *);
/* /*
* rxrpc.c * rxrpc.c
...@@ -1135,10 +1135,10 @@ extern void afs_send_simple_reply(struct afs_call *, const void *, size_t); ...@@ -1135,10 +1135,10 @@ extern void afs_send_simple_reply(struct afs_call *, const void *, size_t);
extern int afs_extract_data(struct afs_call *, bool); extern int afs_extract_data(struct afs_call *, bool);
extern int afs_protocol_error(struct afs_call *, enum afs_eproto_cause); extern int afs_protocol_error(struct afs_call *, enum afs_eproto_cause);
static inline void afs_set_fc_call(struct afs_call *call, struct afs_fs_cursor *fc) static inline void afs_set_fc_call(struct afs_call *call, struct afs_operation *op)
{ {
call->intr = fc->flags & AFS_FS_CURSOR_INTR; call->intr = op->flags & AFS_OPERATION_INTR;
fc->type = call->type; op->type = call->type;
} }
static inline void afs_extract_begin(struct afs_call *call, void *buf, size_t size) static inline void afs_extract_begin(struct afs_call *call, void *buf, size_t size)
...@@ -1256,7 +1256,7 @@ extern void afs_manage_servers(struct work_struct *); ...@@ -1256,7 +1256,7 @@ extern void afs_manage_servers(struct work_struct *);
extern void afs_servers_timer(struct timer_list *); extern void afs_servers_timer(struct timer_list *);
extern void afs_fs_probe_timer(struct timer_list *); extern void afs_fs_probe_timer(struct timer_list *);
extern void __net_exit afs_purge_servers(struct afs_net *); extern void __net_exit afs_purge_servers(struct afs_net *);
extern bool afs_check_server_record(struct afs_fs_cursor *, struct afs_server *); extern bool afs_check_server_record(struct afs_operation *, struct afs_server *);
static inline void afs_inc_servers_outstanding(struct afs_net *net) static inline void afs_inc_servers_outstanding(struct afs_net *net)
{ {
...@@ -1358,7 +1358,7 @@ extern struct afs_volume *afs_create_volume(struct afs_fs_context *); ...@@ -1358,7 +1358,7 @@ extern struct afs_volume *afs_create_volume(struct afs_fs_context *);
extern void afs_activate_volume(struct afs_volume *); extern void afs_activate_volume(struct afs_volume *);
extern void afs_deactivate_volume(struct afs_volume *); extern void afs_deactivate_volume(struct afs_volume *);
extern void afs_put_volume(struct afs_cell *, struct afs_volume *); extern void afs_put_volume(struct afs_cell *, struct afs_volume *);
extern int afs_check_volume_status(struct afs_volume *, struct afs_fs_cursor *); extern int afs_check_volume_status(struct afs_volume *, struct afs_operation *);
/* /*
* write.c * write.c
...@@ -1387,34 +1387,34 @@ extern ssize_t afs_listxattr(struct dentry *, char *, size_t); ...@@ -1387,34 +1387,34 @@ extern ssize_t afs_listxattr(struct dentry *, char *, size_t);
/* /*
* yfsclient.c * yfsclient.c
*/ */
extern int yfs_fs_fetch_file_status(struct afs_fs_cursor *, struct afs_status_cb *, extern int yfs_fs_fetch_file_status(struct afs_operation *, struct afs_status_cb *,
struct afs_volsync *); struct afs_volsync *);
extern int yfs_fs_fetch_data(struct afs_fs_cursor *, struct afs_status_cb *, struct afs_read *); extern int yfs_fs_fetch_data(struct afs_operation *, struct afs_status_cb *, struct afs_read *);
extern int yfs_fs_create_file(struct afs_fs_cursor *, const char *, umode_t, struct afs_status_cb *, extern int yfs_fs_create_file(struct afs_operation *, const char *, umode_t, struct afs_status_cb *,
struct afs_fid *, struct afs_status_cb *); struct afs_fid *, struct afs_status_cb *);
extern int yfs_fs_make_dir(struct afs_fs_cursor *, const char *, umode_t, struct afs_status_cb *, extern int yfs_fs_make_dir(struct afs_operation *, const char *, umode_t, struct afs_status_cb *,
struct afs_fid *, struct afs_status_cb *); struct afs_fid *, struct afs_status_cb *);
extern int yfs_fs_remove_file2(struct afs_fs_cursor *, struct afs_vnode *, const char *, extern int yfs_fs_remove_file2(struct afs_operation *, struct afs_vnode *, const char *,
struct afs_status_cb *, struct afs_status_cb *); struct afs_status_cb *, struct afs_status_cb *);
extern int yfs_fs_remove(struct afs_fs_cursor *, struct afs_vnode *, const char *, bool, extern int yfs_fs_remove(struct afs_operation *, struct afs_vnode *, const char *, bool,
struct afs_status_cb *); struct afs_status_cb *);
extern int yfs_fs_link(struct afs_fs_cursor *, struct afs_vnode *, const char *, extern int yfs_fs_link(struct afs_operation *, struct afs_vnode *, const char *,
struct afs_status_cb *, struct afs_status_cb *); struct afs_status_cb *, struct afs_status_cb *);
extern int yfs_fs_symlink(struct afs_fs_cursor *, const char *, const char *, extern int yfs_fs_symlink(struct afs_operation *, const char *, const char *,
struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *); struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *);
extern int yfs_fs_rename(struct afs_fs_cursor *, const char *, struct afs_vnode *, const char *, extern int yfs_fs_rename(struct afs_operation *, const char *, struct afs_vnode *, const char *,
struct afs_status_cb *, struct afs_status_cb *); struct afs_status_cb *, struct afs_status_cb *);
extern int yfs_fs_store_data(struct afs_fs_cursor *, struct address_space *, extern int yfs_fs_store_data(struct afs_operation *, struct address_space *,
pgoff_t, pgoff_t, unsigned, unsigned, struct afs_status_cb *); pgoff_t, pgoff_t, unsigned, unsigned, struct afs_status_cb *);
extern int yfs_fs_setattr(struct afs_fs_cursor *, struct iattr *, struct afs_status_cb *); extern int yfs_fs_setattr(struct afs_operation *, struct iattr *, struct afs_status_cb *);
extern int yfs_fs_get_volume_status(struct afs_fs_cursor *, struct afs_volume_status *); extern int yfs_fs_get_volume_status(struct afs_operation *, struct afs_volume_status *);
extern int yfs_fs_set_lock(struct afs_fs_cursor *, afs_lock_type_t, struct afs_status_cb *); extern int yfs_fs_set_lock(struct afs_operation *, afs_lock_type_t, struct afs_status_cb *);
extern int yfs_fs_extend_lock(struct afs_fs_cursor *, struct afs_status_cb *); extern int yfs_fs_extend_lock(struct afs_operation *, struct afs_status_cb *);
extern int yfs_fs_release_lock(struct afs_fs_cursor *, struct afs_status_cb *); extern int yfs_fs_release_lock(struct afs_operation *, struct afs_status_cb *);
extern int yfs_fs_fetch_status(struct afs_fs_cursor *, struct afs_net *, extern int yfs_fs_fetch_status(struct afs_operation *, struct afs_net *,
struct afs_fid *, struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *,
struct afs_volsync *); struct afs_volsync *);
extern int yfs_fs_inline_bulk_status(struct afs_fs_cursor *, struct afs_net *, extern int yfs_fs_inline_bulk_status(struct afs_operation *, struct afs_net *,
struct afs_fid *, struct afs_status_cb *, struct afs_fid *, struct afs_status_cb *,
unsigned int, struct afs_volsync *); unsigned int, struct afs_volsync *);
...@@ -1429,9 +1429,9 @@ struct yfs_acl { ...@@ -1429,9 +1429,9 @@ struct yfs_acl {
}; };
extern void yfs_free_opaque_acl(struct yfs_acl *); extern void yfs_free_opaque_acl(struct yfs_acl *);
extern struct yfs_acl *yfs_fs_fetch_opaque_acl(struct afs_fs_cursor *, struct yfs_acl *, extern struct yfs_acl *yfs_fs_fetch_opaque_acl(struct afs_operation *, struct yfs_acl *,
struct afs_status_cb *); struct afs_status_cb *);
extern int yfs_fs_store_opaque_acl2(struct afs_fs_cursor *, const struct afs_acl *, extern int yfs_fs_store_opaque_acl2(struct afs_operation *, const struct afs_acl *,
struct afs_status_cb *); struct afs_status_cb *);
/* /*
...@@ -1447,10 +1447,10 @@ static inline struct inode *AFS_VNODE_TO_I(struct afs_vnode *vnode) ...@@ -1447,10 +1447,10 @@ static inline struct inode *AFS_VNODE_TO_I(struct afs_vnode *vnode)
return &vnode->vfs_inode; return &vnode->vfs_inode;
} }
static inline void afs_check_for_remote_deletion(struct afs_fs_cursor *fc, static inline void afs_check_for_remote_deletion(struct afs_operation *op,
struct afs_vnode *vnode) struct afs_vnode *vnode)
{ {
if (fc->ac.error == -ENOENT) { if (op->ac.error == -ENOENT) {
set_bit(AFS_VNODE_DELETED, &vnode->flags); set_bit(AFS_VNODE_DELETED, &vnode->flags);
afs_break_callback(vnode, afs_cb_break_for_deleted); afs_break_callback(vnode, afs_cb_break_for_deleted);
} }
......
fs/afs/rotate.c
View file @ a310082f
...@@ -20,20 +20,20 @@ ...@@ -20,20 +20,20 @@
* Fileserver operations are serialised on the server by vnode, so we serialise * Fileserver operations are serialised on the server by vnode, so we serialise
* them here also using the io_lock. * them here also using the io_lock.
*/ */
bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode, bool afs_begin_vnode_operation(struct afs_operation *op, struct afs_vnode *vnode,
struct key *key, bool intr) struct key *key, bool intr)
{ {
memset(fc, 0, sizeof(*fc)); memset(op, 0, sizeof(*op));
fc->vnode = vnode; op->vnode = vnode;
fc->key = key; op->key = key;
fc->ac.error = SHRT_MAX; op->ac.error = SHRT_MAX;
fc->error = -EDESTADDRREQ; op->error = -EDESTADDRREQ;
if (intr) { if (intr) {
fc->flags |= AFS_FS_CURSOR_INTR; op->flags |= AFS_OPERATION_INTR;
if (mutex_lock_interruptible(&vnode->io_lock) < 0) { if (mutex_lock_interruptible(&vnode->io_lock) < 0) {
fc->error = -EINTR; op->error = -EINTR;
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
return false; return false;
} }
} else { } else {
...@@ -41,7 +41,7 @@ bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode ...@@ -41,7 +41,7 @@ bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode
} }
if (vnode->lock_state != AFS_VNODE_LOCK_NONE) if (vnode->lock_state != AFS_VNODE_LOCK_NONE)
fc->flags |= AFS_FS_CURSOR_CUR_ONLY; op->flags |= AFS_OPERATION_CUR_ONLY;
return true; return true;
} }
...@@ -49,26 +49,26 @@ bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode ...@@ -49,26 +49,26 @@ bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode
* Begin iteration through a server list, starting with the vnode's last used * Begin iteration through a server list, starting with the vnode's last used
* server if possible, or the last recorded good server if not. * server if possible, or the last recorded good server if not.
*/ */
static bool afs_start_fs_iteration(struct afs_fs_cursor *fc, static bool afs_start_fs_iteration(struct afs_operation *op,
struct afs_vnode *vnode) struct afs_vnode *vnode)
{ {
struct afs_cb_interest *cbi; struct afs_cb_interest *cbi;
int i; int i;
read_lock(&vnode->volume->servers_lock); read_lock(&vnode->volume->servers_lock);
fc->server_list = afs_get_serverlist(vnode->volume->servers); op->server_list = afs_get_serverlist(vnode->volume->servers);
read_unlock(&vnode->volume->servers_lock); read_unlock(&vnode->volume->servers_lock);
fc->untried = (1UL << fc->server_list->nr_servers) - 1; op->untried = (1UL << op->server_list->nr_servers) - 1;
fc->index = READ_ONCE(fc->server_list->preferred); op->index = READ_ONCE(op->server_list->preferred);
cbi = rcu_dereference_protected(vnode->cb_interest, cbi = rcu_dereference_protected(vnode->cb_interest,
lockdep_is_held(&vnode->io_lock)); lockdep_is_held(&vnode->io_lock));
if (cbi) { if (cbi) {
/* See if the vnode's preferred record is still available */ /* See if the vnode's preferred record is still available */
for (i = 0; i < fc->server_list->nr_servers; i++) { for (i = 0; i < op->server_list->nr_servers; i++) {
if (fc->server_list->servers[i].cb_interest == cbi) { if (op->server_list->servers[i].cb_interest == cbi) {
fc->index = i; op->index = i;
goto found_interest; goto found_interest;
} }
} }
...@@ -77,8 +77,8 @@ static bool afs_start_fs_iteration(struct afs_fs_cursor *fc, ...@@ -77,8 +77,8 @@ static bool afs_start_fs_iteration(struct afs_fs_cursor *fc,
* serving this vnode, then we can't switch to another server * serving this vnode, then we can't switch to another server
* and have to return an error. * and have to return an error.
*/ */
if (fc->flags & AFS_FS_CURSOR_CUR_ONLY) { if (op->flags & AFS_OPERATION_CUR_ONLY) {
fc->error = -ESTALE; op->error = -ESTALE;
return false; return false;
} }
...@@ -118,12 +118,12 @@ static void afs_busy(struct afs_volume *volume, u32 abort_code) ...@@ -118,12 +118,12 @@ static void afs_busy(struct afs_volume *volume, u32 abort_code)
/* /*
* Sleep and retry the operation to the same fileserver. * Sleep and retry the operation to the same fileserver.
*/ */
static bool afs_sleep_and_retry(struct afs_fs_cursor *fc) static bool afs_sleep_and_retry(struct afs_operation *op)
{ {
if (fc->flags & AFS_FS_CURSOR_INTR) { if (op->flags & AFS_OPERATION_INTR) {
msleep_interruptible(1000); msleep_interruptible(1000);
if (signal_pending(current)) { if (signal_pending(current)) {
fc->error = -ERESTARTSYS; op->error = -ERESTARTSYS;
return false; return false;
} }
} else { } else {
...@@ -137,26 +137,26 @@ static bool afs_sleep_and_retry(struct afs_fs_cursor *fc) ...@@ -137,26 +137,26 @@ static bool afs_sleep_and_retry(struct afs_fs_cursor *fc)
* Select the fileserver to use. May be called multiple times to rotate * Select the fileserver to use. May be called multiple times to rotate
* through the fileservers. * through the fileservers.
*/ */
bool afs_select_fileserver(struct afs_fs_cursor *fc) bool afs_select_fileserver(struct afs_operation *op)
{ {
struct afs_addr_list *alist; struct afs_addr_list *alist;
struct afs_server *server; struct afs_server *server;
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = op->vnode;
struct afs_error e; struct afs_error e;
u32 rtt; u32 rtt;
int error = fc->ac.error, i; int error = op->ac.error, i;
_enter("%lx[%d],%lx[%d],%d,%d", _enter("%lx[%d],%lx[%d],%d,%d",
fc->untried, fc->index, op->untried, op->index,
fc->ac.tried, fc->ac.index, op->ac.tried, op->ac.index,
error, fc->ac.abort_code); error, op->ac.abort_code);
if (fc->flags & AFS_FS_CURSOR_STOP) { if (op->flags & AFS_OPERATION_STOP) {
_leave(" = f [stopped]"); _leave(" = f [stopped]");
return false; return false;
} }
fc->nr_iterations++; op->nr_iterations++;
/* Evaluate the result of the previous operation, if there was one. */ /* Evaluate the result of the previous operation, if there was one. */
switch (error) { switch (error) {
...@@ -166,8 +166,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -166,8 +166,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
case 0: case 0:
default: default:
/* Success or local failure. Stop. */ /* Success or local failure. Stop. */
fc->error = error; op->error = error;
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
_leave(" = f [okay/local %d]", error); _leave(" = f [okay/local %d]", error);
return false; return false;
...@@ -175,42 +175,42 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -175,42 +175,42 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
/* The far side rejected the operation on some grounds. This /* The far side rejected the operation on some grounds. This
* might involve the server being busy or the volume having been moved. * might involve the server being busy or the volume having been moved.
*/ */
switch (fc->ac.abort_code) { switch (op->ac.abort_code) {
case VNOVOL: case VNOVOL:
/* This fileserver doesn't know about the volume. /* This fileserver doesn't know about the volume.
* - May indicate that the VL is wrong - retry once and compare * - May indicate that the VL is wrong - retry once and compare
* the results. * the results.
* - May indicate that the fileserver couldn't attach to the vol. * - May indicate that the fileserver couldn't attach to the vol.
*/ */
if (fc->flags & AFS_FS_CURSOR_VNOVOL) { if (op->flags & AFS_OPERATION_VNOVOL) {
fc->error = -EREMOTEIO; op->error = -EREMOTEIO;
goto next_server; goto next_server;
} }
write_lock(&vnode->volume->servers_lock); write_lock(&vnode->volume->servers_lock);
fc->server_list->vnovol_mask |= 1 << fc->index; op->server_list->vnovol_mask |= 1 << op->index;
write_unlock(&vnode->volume->servers_lock); write_unlock(&vnode->volume->servers_lock);
set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags); set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags);
error = afs_check_volume_status(vnode->volume, fc); error = afs_check_volume_status(vnode->volume, op);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
if (test_bit(AFS_VOLUME_DELETED, &vnode->volume->flags)) { if (test_bit(AFS_VOLUME_DELETED, &vnode->volume->flags)) {
fc->error = -ENOMEDIUM; op->error = -ENOMEDIUM;
goto failed; goto failed;
} }
/* If the server list didn't change, then assume that /* If the server list didn't change, then assume that
* it's the fileserver having trouble. * it's the fileserver having trouble.
*/ */
if (vnode->volume->servers == fc->server_list) { if (vnode->volume->servers == op->server_list) {
fc->error = -EREMOTEIO; op->error = -EREMOTEIO;
goto next_server; goto next_server;
} }
/* Try again */ /* Try again */
fc->flags |= AFS_FS_CURSOR_VNOVOL; op->flags |= AFS_OPERATION_VNOVOL;
_leave(" = t [vnovol]"); _leave(" = t [vnovol]");
return true; return true;
...@@ -220,20 +220,20 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -220,20 +220,20 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
case VONLINE: case VONLINE:
case VDISKFULL: case VDISKFULL:
case VOVERQUOTA: case VOVERQUOTA:
fc->error = afs_abort_to_error(fc->ac.abort_code); op->error = afs_abort_to_error(op->ac.abort_code);
goto next_server; goto next_server;
case VOFFLINE: case VOFFLINE:
if (!test_and_set_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags)) { if (!test_and_set_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags)) {
afs_busy(vnode->volume, fc->ac.abort_code); afs_busy(vnode->volume, op->ac.abort_code);
clear_bit(AFS_VOLUME_BUSY, &vnode->volume->flags); clear_bit(AFS_VOLUME_BUSY, &vnode->volume->flags);
} }
if (fc->flags & AFS_FS_CURSOR_NO_VSLEEP) { if (op->flags & AFS_OPERATION_NO_VSLEEP) {
fc->error = -EADV; op->error = -EADV;
goto failed; goto failed;
} }
if (fc->flags & AFS_FS_CURSOR_CUR_ONLY) { if (op->flags & AFS_OPERATION_CUR_ONLY) {
fc->error = -ESTALE; op->error = -ESTALE;
goto failed; goto failed;
} }
goto busy; goto busy;
...@@ -244,17 +244,17 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -244,17 +244,17 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
/* Retry after going round all the servers unless we /* Retry after going round all the servers unless we
* have a file lock we need to maintain. * have a file lock we need to maintain.
*/ */
if (fc->flags & AFS_FS_CURSOR_NO_VSLEEP) { if (op->flags & AFS_OPERATION_NO_VSLEEP) {
fc->error = -EBUSY; op->error = -EBUSY;
goto failed; goto failed;
} }
if (!test_and_set_bit(AFS_VOLUME_BUSY, &vnode->volume->flags)) { if (!test_and_set_bit(AFS_VOLUME_BUSY, &vnode->volume->flags)) {
afs_busy(vnode->volume, fc->ac.abort_code); afs_busy(vnode->volume, op->ac.abort_code);
clear_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags); clear_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags);
} }
busy: busy:
if (fc->flags & AFS_FS_CURSOR_CUR_ONLY) { if (op->flags & AFS_OPERATION_CUR_ONLY) {
if (!afs_sleep_and_retry(fc)) if (!afs_sleep_and_retry(op))
goto failed; goto failed;
/* Retry with same server & address */ /* Retry with same server & address */
...@@ -262,7 +262,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -262,7 +262,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
return true; return true;
} }
fc->flags |= AFS_FS_CURSOR_VBUSY; op->flags |= AFS_OPERATION_VBUSY;
goto next_server; goto next_server;
case VMOVED: case VMOVED:
...@@ -273,15 +273,15 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -273,15 +273,15 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
* We also limit the number of VMOVED hops we will * We also limit the number of VMOVED hops we will
* honour, just in case someone sets up a loop. * honour, just in case someone sets up a loop.
*/ */
if (fc->flags & AFS_FS_CURSOR_VMOVED) { if (op->flags & AFS_OPERATION_VMOVED) {
fc->error = -EREMOTEIO; op->error = -EREMOTEIO;
goto failed; goto failed;
} }
fc->flags |= AFS_FS_CURSOR_VMOVED; op->flags |= AFS_OPERATION_VMOVED;
set_bit(AFS_VOLUME_WAIT, &vnode->volume->flags); set_bit(AFS_VOLUME_WAIT, &vnode->volume->flags);
set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags); set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags);
error = afs_check_volume_status(vnode->volume, fc); error = afs_check_volume_status(vnode->volume, op);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
...@@ -294,8 +294,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -294,8 +294,8 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
* *
* TODO: Retry a few times with sleeps. * TODO: Retry a few times with sleeps.
*/ */
if (vnode->volume->servers == fc->server_list) { if (vnode->volume->servers == op->server_list) {
fc->error = -ENOMEDIUM; op->error = -ENOMEDIUM;
goto failed; goto failed;
} }
...@@ -304,13 +304,13 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -304,13 +304,13 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
default: default:
clear_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags); clear_bit(AFS_VOLUME_OFFLINE, &vnode->volume->flags);
clear_bit(AFS_VOLUME_BUSY, &vnode->volume->flags); clear_bit(AFS_VOLUME_BUSY, &vnode->volume->flags);
fc->error = afs_abort_to_error(fc->ac.abort_code); op->error = afs_abort_to_error(op->ac.abort_code);
goto failed; goto failed;
} }
case -ETIMEDOUT: case -ETIMEDOUT:
case -ETIME: case -ETIME:
if (fc->error != -EDESTADDRREQ) if (op->error != -EDESTADDRREQ)
goto iterate_address; goto iterate_address;
/* Fall through */ /* Fall through */
case -ERFKILL: case -ERFKILL:
...@@ -320,83 +320,83 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -320,83 +320,83 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
case -EHOSTDOWN: case -EHOSTDOWN:
case -ECONNREFUSED: case -ECONNREFUSED:
_debug("no conn"); _debug("no conn");
fc->error = error; op->error = error;
goto iterate_address; goto iterate_address;
case -ECONNRESET: case -ECONNRESET:
_debug("call reset"); _debug("call reset");
fc->error = error; op->error = error;
goto failed; goto failed;
} }
restart_from_beginning: restart_from_beginning:
_debug("restart"); _debug("restart");
afs_end_cursor(&fc->ac); afs_end_cursor(&op->ac);
afs_put_cb_interest(afs_v2net(vnode), fc->cbi); afs_put_cb_interest(afs_v2net(vnode), op->cbi);
fc->cbi = NULL; op->cbi = NULL;
afs_put_serverlist(afs_v2net(vnode), fc->server_list); afs_put_serverlist(afs_v2net(vnode), op->server_list);
fc->server_list = NULL; op->server_list = NULL;
start: start:
_debug("start"); _debug("start");
/* See if we need to do an update of the volume record. Note that the /* See if we need to do an update of the volume record. Note that the
* volume may have moved or even have been deleted. * volume may have moved or even have been deleted.
*/ */
error = afs_check_volume_status(vnode->volume, fc); error = afs_check_volume_status(vnode->volume, op);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
if (!afs_start_fs_iteration(fc, vnode)) if (!afs_start_fs_iteration(op, vnode))
goto failed; goto failed;
_debug("__ VOL %llx __", vnode->volume->vid); _debug("__ VOL %llx __", vnode->volume->vid);
pick_server: pick_server:
_debug("pick [%lx]", fc->untried); _debug("pick [%lx]", op->untried);
error = afs_wait_for_fs_probes(fc->server_list, fc->untried); error = afs_wait_for_fs_probes(op->server_list, op->untried);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
/* Pick the untried server with the lowest RTT. If we have outstanding /* Pick the untried server with the lowest RTT. If we have outstanding
* callbacks, we stick with the server we're already using if we can. * callbacks, we stick with the server we're already using if we can.
*/ */
if (fc->cbi) { if (op->cbi) {
_debug("cbi %u", fc->index); _debug("cbi %u", op->index);
if (test_bit(fc->index, &fc->untried)) if (test_bit(op->index, &op->untried))
goto selected_server; goto selected_server;
afs_put_cb_interest(afs_v2net(vnode), fc->cbi); afs_put_cb_interest(afs_v2net(vnode), op->cbi);
fc->cbi = NULL; op->cbi = NULL;
_debug("nocbi"); _debug("nocbi");
} }
fc->index = -1; op->index = -1;
rtt = U32_MAX; rtt = U32_MAX;
for (i = 0; i < fc->server_list->nr_servers; i++) { for (i = 0; i < op->server_list->nr_servers; i++) {
struct afs_server *s = fc->server_list->servers[i].server; struct afs_server *s = op->server_list->servers[i].server;
if (!test_bit(i, &fc->untried) || !s->probe.responded) if (!test_bit(i, &op->untried) || !s->probe.responded)
continue; continue;
if (s->probe.rtt < rtt) { if (s->probe.rtt < rtt) {
fc->index = i; op->index = i;
rtt = s->probe.rtt; rtt = s->probe.rtt;
} }
} }
if (fc->index == -1) if (op->index == -1)
goto no_more_servers; goto no_more_servers;
selected_server: selected_server:
_debug("use %d", fc->index); _debug("use %d", op->index);
__clear_bit(fc->index, &fc->untried); __clear_bit(op->index, &op->untried);
/* We're starting on a different fileserver from the list. We need to /* We're starting on a different fileserver from the list. We need to
* check it, create a callback intercept, find its address list and * check it, create a callback intercept, find its address list and
* probe its capabilities before we use it. * probe its capabilities before we use it.
*/ */
ASSERTCMP(fc->ac.alist, ==, NULL); ASSERTCMP(op->ac.alist, ==, NULL);
server = fc->server_list->servers[fc->index].server; server = op->server_list->servers[op->index].server;
if (!afs_check_server_record(fc, server)) if (!afs_check_server_record(op, server))
goto failed; goto failed;
_debug("USING SERVER: %pU", &server->uuid); _debug("USING SERVER: %pU", &server->uuid);
...@@ -406,12 +406,12 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -406,12 +406,12 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
* break request before we've finished decoding the reply and * break request before we've finished decoding the reply and
* installing the vnode. * installing the vnode.
*/ */
error = afs_register_server_cb_interest(vnode, fc->server_list, error = afs_register_server_cb_interest(vnode, op->server_list,
fc->index); op->index);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
fc->cbi = afs_get_cb_interest( op->cbi = afs_get_cb_interest(
rcu_dereference_protected(vnode->cb_interest, rcu_dereference_protected(vnode->cb_interest,
lockdep_is_held(&vnode->io_lock))); lockdep_is_held(&vnode->io_lock)));
...@@ -421,44 +421,44 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -421,44 +421,44 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
afs_get_addrlist(alist); afs_get_addrlist(alist);
read_unlock(&server->fs_lock); read_unlock(&server->fs_lock);
memset(&fc->ac, 0, sizeof(fc->ac)); memset(&op->ac, 0, sizeof(op->ac));
if (!fc->ac.alist) if (!op->ac.alist)
fc->ac.alist = alist; op->ac.alist = alist;
else else
afs_put_addrlist(alist); afs_put_addrlist(alist);
fc->ac.index = -1; op->ac.index = -1;
iterate_address: iterate_address:
ASSERT(fc->ac.alist); ASSERT(op->ac.alist);
/* Iterate over the current server's address list to try and find an /* Iterate over the current server's address list to try and find an
* address on which it will respond to us. * address on which it will respond to us.
*/ */
if (!afs_iterate_addresses(&fc->ac)) if (!afs_iterate_addresses(&op->ac))
goto next_server; goto next_server;
_debug("address [%u] %u/%u", fc->index, fc->ac.index, fc->ac.alist->nr_addrs); _debug("address [%u] %u/%u", op->index, op->ac.index, op->ac.alist->nr_addrs);
_leave(" = t"); _leave(" = t");
return true; return true;
next_server: next_server:
_debug("next"); _debug("next");
afs_end_cursor(&fc->ac); afs_end_cursor(&op->ac);
goto pick_server; goto pick_server;
no_more_servers: no_more_servers:
/* That's all the servers poked to no good effect. Try again if some /* That's all the servers poked to no good effect. Try again if some
* of them were busy. * of them were busy.
*/ */
if (fc->flags & AFS_FS_CURSOR_VBUSY) if (op->flags & AFS_OPERATION_VBUSY)
goto restart_from_beginning; goto restart_from_beginning;
e.error = -EDESTADDRREQ; e.error = -EDESTADDRREQ;
e.responded = false; e.responded = false;
for (i = 0; i < fc->server_list->nr_servers; i++) { for (i = 0; i < op->server_list->nr_servers; i++) {
struct afs_server *s = fc->server_list->servers[i].server; struct afs_server *s = op->server_list->servers[i].server;
afs_prioritise_error(&e, READ_ONCE(s->probe.error), afs_prioritise_error(&e, READ_ONCE(s->probe.error),
s->probe.abort_code); s->probe.abort_code);
...@@ -467,11 +467,11 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -467,11 +467,11 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
error = e.error; error = e.error;
failed_set_error: failed_set_error:
fc->error = error; op->error = error;
failed: failed:
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
afs_end_cursor(&fc->ac); afs_end_cursor(&op->ac);
_leave(" = f [failed %d]", fc->error); _leave(" = f [failed %d]", op->error);
return false; return false;
} }
...@@ -480,12 +480,12 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc) ...@@ -480,12 +480,12 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
* fileserver. We use this when we have a lock on that file, which is backed * fileserver. We use this when we have a lock on that file, which is backed
* only by the fileserver we obtained it from. * only by the fileserver we obtained it from.
*/ */
bool afs_select_current_fileserver(struct afs_fs_cursor *fc) bool afs_select_current_fileserver(struct afs_operation *op)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = op->vnode;
struct afs_cb_interest *cbi; struct afs_cb_interest *cbi;
struct afs_addr_list *alist; struct afs_addr_list *alist;
int error = fc->ac.error; int error = op->ac.error;
_enter(""); _enter("");
...@@ -495,12 +495,12 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) ...@@ -495,12 +495,12 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc)
switch (error) { switch (error) {
case SHRT_MAX: case SHRT_MAX:
if (!cbi) { if (!cbi) {
fc->error = -ESTALE; op->error = -ESTALE;
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
return false; return false;
} }
fc->cbi = afs_get_cb_interest(cbi); op->cbi = afs_get_cb_interest(cbi);
read_lock(&cbi->server->fs_lock); read_lock(&cbi->server->fs_lock);
alist = rcu_dereference_protected(cbi->server->addresses, alist = rcu_dereference_protected(cbi->server->addresses,
...@@ -508,27 +508,27 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) ...@@ -508,27 +508,27 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc)
afs_get_addrlist(alist); afs_get_addrlist(alist);
read_unlock(&cbi->server->fs_lock); read_unlock(&cbi->server->fs_lock);
if (!alist) { if (!alist) {
fc->error = -ESTALE; op->error = -ESTALE;
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
return false; return false;
} }
memset(&fc->ac, 0, sizeof(fc->ac)); memset(&op->ac, 0, sizeof(op->ac));
fc->ac.alist = alist; op->ac.alist = alist;
fc->ac.index = -1; op->ac.index = -1;
goto iterate_address; goto iterate_address;
case 0: case 0:
default: default:
/* Success or local failure. Stop. */ /* Success or local failure. Stop. */
fc->error = error; op->error = error;
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
_leave(" = f [okay/local %d]", error); _leave(" = f [okay/local %d]", error);
return false; return false;
case -ECONNABORTED: case -ECONNABORTED:
fc->error = afs_abort_to_error(fc->ac.abort_code); op->error = afs_abort_to_error(op->ac.abort_code);
fc->flags |= AFS_FS_CURSOR_STOP; op->flags |= AFS_OPERATION_STOP;
_leave(" = f [abort]"); _leave(" = f [abort]");
return false; return false;
...@@ -541,7 +541,7 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) ...@@ -541,7 +541,7 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc)
case -ETIMEDOUT: case -ETIMEDOUT:
case -ETIME: case -ETIME:
_debug("no conn"); _debug("no conn");
fc->error = error; op->error = error;
goto iterate_address; goto iterate_address;
} }
...@@ -549,19 +549,19 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) ...@@ -549,19 +549,19 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc)
/* Iterate over the current server's address list to try and find an /* Iterate over the current server's address list to try and find an
* address on which it will respond to us. * address on which it will respond to us.
*/ */
if (afs_iterate_addresses(&fc->ac)) { if (afs_iterate_addresses(&op->ac)) {
_leave(" = t"); _leave(" = t");
return true; return true;
} }
afs_end_cursor(&fc->ac); afs_end_cursor(&op->ac);
return false; return false;
} }
/* /*
* Dump cursor state in the case of the error being EDESTADDRREQ. * Dump cursor state in the case of the error being EDESTADDRREQ.
*/ */
static void afs_dump_edestaddrreq(const struct afs_fs_cursor *fc) static void afs_dump_edestaddrreq(const struct afs_operation *op)
{ {
static int count; static int count;
int i; int i;
...@@ -574,12 +574,12 @@ static void afs_dump_edestaddrreq(const struct afs_fs_cursor *fc) ...@@ -574,12 +574,12 @@ static void afs_dump_edestaddrreq(const struct afs_fs_cursor *fc)
pr_notice("EDESTADDR occurred\n"); pr_notice("EDESTADDR occurred\n");
pr_notice("FC: cbb=%x cbb2=%x fl=%hx err=%hd\n", pr_notice("FC: cbb=%x cbb2=%x fl=%hx err=%hd\n",
fc->cb_break, fc->cb_break_2, fc->flags, fc->error); op->cb_break, op->cb_break_2, op->flags, op->error);
pr_notice("FC: ut=%lx ix=%d ni=%u\n", pr_notice("FC: ut=%lx ix=%d ni=%u\n",
fc->untried, fc->index, fc->nr_iterations); op->untried, op->index, op->nr_iterations);
if (fc->server_list) { if (op->server_list) {
const struct afs_server_list *sl = fc->server_list; const struct afs_server_list *sl = op->server_list;
pr_notice("FC: SL nr=%u pr=%u vnov=%hx\n", pr_notice("FC: SL nr=%u pr=%u vnov=%hx\n",
sl->nr_servers, sl->preferred, sl->vnovol_mask); sl->nr_servers, sl->preferred, sl->vnovol_mask);
for (i = 0; i < sl->nr_servers; i++) { for (i = 0; i < sl->nr_servers; i++) {
...@@ -595,39 +595,39 @@ static void afs_dump_edestaddrreq(const struct afs_fs_cursor *fc) ...@@ -595,39 +595,39 @@ static void afs_dump_edestaddrreq(const struct afs_fs_cursor *fc)
a->preferred); a->preferred);
pr_notice("FC: - R=%lx F=%lx\n", pr_notice("FC: - R=%lx F=%lx\n",
a->responded, a->failed); a->responded, a->failed);
if (a == fc->ac.alist) if (a == op->ac.alist)
pr_notice("FC: - current\n"); pr_notice("FC: - current\n");
} }
} }
} }
pr_notice("AC: t=%lx ax=%u ac=%d er=%d r=%u ni=%u\n", pr_notice("AC: t=%lx ax=%u ac=%d er=%d r=%u ni=%u\n",
fc->ac.tried, fc->ac.index, fc->ac.abort_code, fc->ac.error, op->ac.tried, op->ac.index, op->ac.abort_code, op->ac.error,
fc->ac.responded, fc->ac.nr_iterations); op->ac.responded, op->ac.nr_iterations);
rcu_read_unlock(); rcu_read_unlock();
} }
/* /*
* Tidy up a filesystem cursor and unlock the vnode. * Tidy up a filesystem cursor and unlock the vnode.
*/ */
int afs_end_vnode_operation(struct afs_fs_cursor *fc) int afs_end_vnode_operation(struct afs_operation *op)
{ {
struct afs_net *net = afs_v2net(fc->vnode); struct afs_net *net = afs_v2net(op->vnode);
if (fc->error == -EDESTADDRREQ || if (op->error == -EDESTADDRREQ ||
fc->error == -EADDRNOTAVAIL || op->error == -EADDRNOTAVAIL ||
fc->error == -ENETUNREACH || op->error == -ENETUNREACH ||
fc->error == -EHOSTUNREACH) op->error == -EHOSTUNREACH)
afs_dump_edestaddrreq(fc); afs_dump_edestaddrreq(op);
mutex_unlock(&fc->vnode->io_lock); mutex_unlock(&op->vnode->io_lock);
afs_end_cursor(&fc->ac); afs_end_cursor(&op->ac);
afs_put_cb_interest(net, fc->cbi); afs_put_cb_interest(net, op->cbi);
afs_put_serverlist(net, fc->server_list); afs_put_serverlist(net, op->server_list);
if (fc->error == -ECONNABORTED) if (op->error == -ECONNABORTED)
fc->error = afs_abort_to_error(fc->ac.abort_code); op->error = afs_abort_to_error(op->ac.abort_code);
return fc->error; return op->error;
} }
fs/afs/server.c
View file @ a310082f
...@@ -571,7 +571,7 @@ void afs_purge_servers(struct afs_net *net) ...@@ -571,7 +571,7 @@ void afs_purge_servers(struct afs_net *net)
/* /*
* Get an update for a server's address list. * Get an update for a server's address list.
*/ */
static noinline bool afs_update_server_record(struct afs_fs_cursor *fc, struct afs_server *server) static noinline bool afs_update_server_record(struct afs_operation *fc, struct afs_server *server)
{ {
struct afs_addr_list *alist, *discard; struct afs_addr_list *alist, *discard;
...@@ -585,7 +585,7 @@ static noinline bool afs_update_server_record(struct afs_fs_cursor *fc, struct a ...@@ -585,7 +585,7 @@ static noinline bool afs_update_server_record(struct afs_fs_cursor *fc, struct a
if (IS_ERR(alist)) { if (IS_ERR(alist)) {
if ((PTR_ERR(alist) == -ERESTARTSYS || if ((PTR_ERR(alist) == -ERESTARTSYS ||
PTR_ERR(alist) == -EINTR) && PTR_ERR(alist) == -EINTR) &&
!(fc->flags & AFS_FS_CURSOR_INTR) && !(fc->flags & AFS_OPERATION_INTR) &&
server->addresses) { server->addresses) {
_leave(" = t [intr]"); _leave(" = t [intr]");
return true; return true;
...@@ -613,7 +613,7 @@ static noinline bool afs_update_server_record(struct afs_fs_cursor *fc, struct a ...@@ -613,7 +613,7 @@ static noinline bool afs_update_server_record(struct afs_fs_cursor *fc, struct a
/* /*
* See if a server's address list needs updating. * See if a server's address list needs updating.
*/ */
bool afs_check_server_record(struct afs_fs_cursor *fc, struct afs_server *server) bool afs_check_server_record(struct afs_operation *fc, struct afs_server *server)
{ {
bool success; bool success;
int ret, retries = 0; int ret, retries = 0;
...@@ -642,7 +642,7 @@ bool afs_check_server_record(struct afs_fs_cursor *fc, struct afs_server *server ...@@ -642,7 +642,7 @@ bool afs_check_server_record(struct afs_fs_cursor *fc, struct afs_server *server
wait: wait:
ret = wait_on_bit(&server->flags, AFS_SERVER_FL_UPDATING, ret = wait_on_bit(&server->flags, AFS_SERVER_FL_UPDATING,
(fc->flags & AFS_FS_CURSOR_INTR) ? (fc->flags & AFS_OPERATION_INTR) ?
TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
if (ret == -ERESTARTSYS) { if (ret == -ERESTARTSYS) {
fc->error = ret; fc->error = ret;
......
fs/afs/super.c
View file @ a310082f
...@@ -715,7 +715,7 @@ static void afs_destroy_inode(struct inode *inode) ...@@ -715,7 +715,7 @@ static void afs_destroy_inode(struct inode *inode)
static int afs_statfs(struct dentry *dentry, struct kstatfs *buf) static int afs_statfs(struct dentry *dentry, struct kstatfs *buf)
{ {
struct afs_super_info *as = AFS_FS_S(dentry->d_sb); struct afs_super_info *as = AFS_FS_S(dentry->d_sb);
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_volume_status vs; struct afs_volume_status vs;
struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry)); struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry));
struct key *key; struct key *key;
...@@ -738,7 +738,7 @@ static int afs_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -738,7 +738,7 @@ static int afs_statfs(struct dentry *dentry, struct kstatfs *buf)
ret = -ERESTARTSYS; ret = -ERESTARTSYS;
if (afs_begin_vnode_operation(&fc, vnode, key, true)) { if (afs_begin_vnode_operation(&fc, vnode, key, true)) {
fc.flags |= AFS_FS_CURSOR_NO_VSLEEP; fc.flags |= AFS_OPERATION_NO_VSLEEP;
while (afs_select_fileserver(&fc)) { while (afs_select_fileserver(&fc)) {
fc.cb_break = afs_calc_vnode_cb_break(vnode); fc.cb_break = afs_calc_vnode_cb_break(vnode);
afs_fs_get_volume_status(&fc, &vs); afs_fs_get_volume_status(&fc, &vs);
......
fs/afs/volume.c
View file @ a310082f
...@@ -280,7 +280,7 @@ static int afs_update_volume_status(struct afs_volume *volume, struct key *key) ...@@ -280,7 +280,7 @@ static int afs_update_volume_status(struct afs_volume *volume, struct key *key)
/* /*
* Make sure the volume record is up to date. * Make sure the volume record is up to date.
*/ */
int afs_check_volume_status(struct afs_volume *volume, struct afs_fs_cursor *fc) int afs_check_volume_status(struct afs_volume *volume, struct afs_operation *fc)
{ {
int ret, retries = 0; int ret, retries = 0;
...@@ -315,7 +315,7 @@ int afs_check_volume_status(struct afs_volume *volume, struct afs_fs_cursor *fc) ...@@ -315,7 +315,7 @@ int afs_check_volume_status(struct afs_volume *volume, struct afs_fs_cursor *fc)
} }
ret = wait_on_bit(&volume->flags, AFS_VOLUME_WAIT, ret = wait_on_bit(&volume->flags, AFS_VOLUME_WAIT,
(fc->flags & AFS_FS_CURSOR_INTR) ? (fc->flags & AFS_OPERATION_INTR) ?
TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
if (ret == -ERESTARTSYS) { if (ret == -ERESTARTSYS) {
_leave(" = %d", ret); _leave(" = %d", ret);
......
fs/afs/write.c
View file @ a310082f
...@@ -356,7 +356,7 @@ static int afs_store_data(struct address_space *mapping, ...@@ -356,7 +356,7 @@ static int afs_store_data(struct address_space *mapping,
unsigned offset, unsigned to) unsigned offset, unsigned to)
{ {
struct afs_vnode *vnode = AFS_FS_I(mapping->host); struct afs_vnode *vnode = AFS_FS_I(mapping->host);
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_wb_key *wbk = NULL; struct afs_wb_key *wbk = NULL;
struct list_head *p; struct list_head *p;
......
fs/afs/xattr.c
View file @ a310082f
...@@ -42,7 +42,7 @@ static int afs_xattr_get_acl(const struct xattr_handler *handler, ...@@ -42,7 +42,7 @@ static int afs_xattr_get_acl(const struct xattr_handler *handler,
struct inode *inode, const char *name, struct inode *inode, const char *name,
void *buffer, size_t size) void *buffer, size_t size)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *vnode = AFS_FS_I(inode); struct afs_vnode *vnode = AFS_FS_I(inode);
struct afs_acl *acl = NULL; struct afs_acl *acl = NULL;
...@@ -100,7 +100,7 @@ static int afs_xattr_set_acl(const struct xattr_handler *handler, ...@@ -100,7 +100,7 @@ static int afs_xattr_set_acl(const struct xattr_handler *handler,
struct inode *inode, const char *name, struct inode *inode, const char *name,
const void *buffer, size_t size, int flags) const void *buffer, size_t size, int flags)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *vnode = AFS_FS_I(inode); struct afs_vnode *vnode = AFS_FS_I(inode);
struct afs_acl *acl = NULL; struct afs_acl *acl = NULL;
...@@ -165,7 +165,7 @@ static int afs_xattr_get_yfs(const struct xattr_handler *handler, ...@@ -165,7 +165,7 @@ static int afs_xattr_get_yfs(const struct xattr_handler *handler,
struct inode *inode, const char *name, struct inode *inode, const char *name,
void *buffer, size_t size) void *buffer, size_t size)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *vnode = AFS_FS_I(inode); struct afs_vnode *vnode = AFS_FS_I(inode);
struct yfs_acl *yacl = NULL; struct yfs_acl *yacl = NULL;
...@@ -270,7 +270,7 @@ static int afs_xattr_set_yfs(const struct xattr_handler *handler, ...@@ -270,7 +270,7 @@ static int afs_xattr_set_yfs(const struct xattr_handler *handler,
struct inode *inode, const char *name, struct inode *inode, const char *name,
const void *buffer, size_t size, int flags) const void *buffer, size_t size, int flags)
{ {
struct afs_fs_cursor fc; struct afs_operation fc;
struct afs_status_cb *scb; struct afs_status_cb *scb;
struct afs_vnode *vnode = AFS_FS_I(inode); struct afs_vnode *vnode = AFS_FS_I(inode);
struct afs_acl *acl = NULL; struct afs_acl *acl = NULL;
......
fs/afs/yfsclient.c
View file @ a310082f
...@@ -387,7 +387,7 @@ static const struct afs_call_type yfs_RXYFSFetchStatus_vnode = { ...@@ -387,7 +387,7 @@ static const struct afs_call_type yfs_RXYFSFetchStatus_vnode = {
/* /*
* Fetch the status information for a file. * Fetch the status information for a file.
*/ */
int yfs_fs_fetch_file_status(struct afs_fs_cursor *fc, struct afs_status_cb *scb, int yfs_fs_fetch_file_status(struct afs_operation *fc, struct afs_status_cb *scb,
struct afs_volsync *volsync) struct afs_volsync *volsync)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -575,7 +575,7 @@ static const struct afs_call_type yfs_RXYFSFetchData64 = { ...@@ -575,7 +575,7 @@ static const struct afs_call_type yfs_RXYFSFetchData64 = {
/* /*
* Fetch data from a file. * Fetch data from a file.
*/ */
int yfs_fs_fetch_data(struct afs_fs_cursor *fc, struct afs_status_cb *scb, int yfs_fs_fetch_data(struct afs_operation *fc, struct afs_status_cb *scb,
struct afs_read *req) struct afs_read *req)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -657,7 +657,7 @@ static const struct afs_call_type afs_RXFSCreateFile = { ...@@ -657,7 +657,7 @@ static const struct afs_call_type afs_RXFSCreateFile = {
/* /*
* Create a file. * Create a file.
*/ */
int yfs_fs_create_file(struct afs_fs_cursor *fc, int yfs_fs_create_file(struct afs_operation *fc,
const char *name, const char *name,
umode_t mode, umode_t mode,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
...@@ -721,7 +721,7 @@ static const struct afs_call_type yfs_RXFSMakeDir = { ...@@ -721,7 +721,7 @@ static const struct afs_call_type yfs_RXFSMakeDir = {
/* /*
* Make a directory. * Make a directory.
*/ */
int yfs_fs_make_dir(struct afs_fs_cursor *fc, int yfs_fs_make_dir(struct afs_operation *fc,
const char *name, const char *name,
umode_t mode, umode_t mode,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
...@@ -811,7 +811,7 @@ static const struct afs_call_type yfs_RXYFSRemoveFile2 = { ...@@ -811,7 +811,7 @@ static const struct afs_call_type yfs_RXYFSRemoveFile2 = {
/* /*
* Remove a file and retrieve new file status. * Remove a file and retrieve new file status.
*/ */
int yfs_fs_remove_file2(struct afs_fs_cursor *fc, struct afs_vnode *vnode, int yfs_fs_remove_file2(struct afs_operation *fc, struct afs_vnode *vnode,
const char *name, struct afs_status_cb *dvnode_scb, const char *name, struct afs_status_cb *dvnode_scb,
struct afs_status_cb *vnode_scb) struct afs_status_cb *vnode_scb)
{ {
...@@ -896,7 +896,7 @@ static const struct afs_call_type yfs_RXYFSRemoveDir = { ...@@ -896,7 +896,7 @@ static const struct afs_call_type yfs_RXYFSRemoveDir = {
/* /*
* remove a file or directory * remove a file or directory
*/ */
int yfs_fs_remove(struct afs_fs_cursor *fc, struct afs_vnode *vnode, int yfs_fs_remove(struct afs_operation *fc, struct afs_vnode *vnode,
const char *name, bool isdir, const char *name, bool isdir,
struct afs_status_cb *dvnode_scb) struct afs_status_cb *dvnode_scb)
{ {
...@@ -973,7 +973,7 @@ static const struct afs_call_type yfs_RXYFSLink = { ...@@ -973,7 +973,7 @@ static const struct afs_call_type yfs_RXYFSLink = {
/* /*
* Make a hard link. * Make a hard link.
*/ */
int yfs_fs_link(struct afs_fs_cursor *fc, struct afs_vnode *vnode, int yfs_fs_link(struct afs_operation *fc, struct afs_vnode *vnode,
const char *name, const char *name,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
struct afs_status_cb *vnode_scb) struct afs_status_cb *vnode_scb)
...@@ -1057,7 +1057,7 @@ static const struct afs_call_type yfs_RXYFSSymlink = { ...@@ -1057,7 +1057,7 @@ static const struct afs_call_type yfs_RXYFSSymlink = {
/* /*
* Create a symbolic link. * Create a symbolic link.
*/ */
int yfs_fs_symlink(struct afs_fs_cursor *fc, int yfs_fs_symlink(struct afs_operation *fc,
const char *name, const char *name,
const char *contents, const char *contents,
struct afs_status_cb *dvnode_scb, struct afs_status_cb *dvnode_scb,
...@@ -1148,7 +1148,7 @@ static const struct afs_call_type yfs_RXYFSRename = { ...@@ -1148,7 +1148,7 @@ static const struct afs_call_type yfs_RXYFSRename = {
/* /*
* Rename a file or directory. * Rename a file or directory.
*/ */
int yfs_fs_rename(struct afs_fs_cursor *fc, int yfs_fs_rename(struct afs_operation *fc,
const char *orig_name, const char *orig_name,
struct afs_vnode *new_dvnode, struct afs_vnode *new_dvnode,
const char *new_name, const char *new_name,
...@@ -1212,7 +1212,7 @@ static const struct afs_call_type yfs_RXYFSStoreData64 = { ...@@ -1212,7 +1212,7 @@ static const struct afs_call_type yfs_RXYFSStoreData64 = {
/* /*
* Store a set of pages to a large file. * Store a set of pages to a large file.
*/ */
int yfs_fs_store_data(struct afs_fs_cursor *fc, struct address_space *mapping, int yfs_fs_store_data(struct afs_operation *fc, struct address_space *mapping,
pgoff_t first, pgoff_t last, pgoff_t first, pgoff_t last,
unsigned offset, unsigned to, unsigned offset, unsigned to,
struct afs_status_cb *scb) struct afs_status_cb *scb)
...@@ -1299,7 +1299,7 @@ static const struct afs_call_type yfs_RXYFSStoreData64_as_Status = { ...@@ -1299,7 +1299,7 @@ static const struct afs_call_type yfs_RXYFSStoreData64_as_Status = {
* Set the attributes on a file, using YFS.StoreData64 rather than * Set the attributes on a file, using YFS.StoreData64 rather than
* YFS.StoreStatus so as to alter the file size also. * YFS.StoreStatus so as to alter the file size also.
*/ */
static int yfs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr, static int yfs_fs_setattr_size(struct afs_operation *fc, struct iattr *attr,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1345,7 +1345,7 @@ static int yfs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr, ...@@ -1345,7 +1345,7 @@ static int yfs_fs_setattr_size(struct afs_fs_cursor *fc, struct iattr *attr,
* Set the attributes on a file, using YFS.StoreData64 if there's a change in * Set the attributes on a file, using YFS.StoreData64 if there's a change in
* file size, and YFS.StoreStatus otherwise. * file size, and YFS.StoreStatus otherwise.
*/ */
int yfs_fs_setattr(struct afs_fs_cursor *fc, struct iattr *attr, int yfs_fs_setattr(struct afs_operation *fc, struct iattr *attr,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1526,7 +1526,7 @@ static const struct afs_call_type yfs_RXYFSGetVolumeStatus = { ...@@ -1526,7 +1526,7 @@ static const struct afs_call_type yfs_RXYFSGetVolumeStatus = {
/* /*
* fetch the status of a volume * fetch the status of a volume
*/ */
int yfs_fs_get_volume_status(struct afs_fs_cursor *fc, int yfs_fs_get_volume_status(struct afs_operation *fc,
struct afs_volume_status *vs) struct afs_volume_status *vs)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1598,7 +1598,7 @@ static const struct afs_call_type yfs_RXYFSReleaseLock = { ...@@ -1598,7 +1598,7 @@ static const struct afs_call_type yfs_RXYFSReleaseLock = {
/* /*
* Set a lock on a file * Set a lock on a file
*/ */
int yfs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type, int yfs_fs_set_lock(struct afs_operation *fc, afs_lock_type_t type,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
...@@ -1639,7 +1639,7 @@ int yfs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type, ...@@ -1639,7 +1639,7 @@ int yfs_fs_set_lock(struct afs_fs_cursor *fc, afs_lock_type_t type,
/* /*
* extend a lock on a file * extend a lock on a file
*/ */
int yfs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) int yfs_fs_extend_lock(struct afs_operation *fc, struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
struct afs_call *call; struct afs_call *call;
...@@ -1677,7 +1677,7 @@ int yfs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) ...@@ -1677,7 +1677,7 @@ int yfs_fs_extend_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb)
/* /*
* release a lock on a file * release a lock on a file
*/ */
int yfs_fs_release_lock(struct afs_fs_cursor *fc, struct afs_status_cb *scb) int yfs_fs_release_lock(struct afs_operation *fc, struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
struct afs_call *call; struct afs_call *call;
...@@ -1725,7 +1725,7 @@ static const struct afs_call_type yfs_RXYFSFetchStatus = { ...@@ -1725,7 +1725,7 @@ static const struct afs_call_type yfs_RXYFSFetchStatus = {
/* /*
* Fetch the status information for a fid without needing a vnode handle. * Fetch the status information for a fid without needing a vnode handle.
*/ */
int yfs_fs_fetch_status(struct afs_fs_cursor *fc, int yfs_fs_fetch_status(struct afs_operation *fc,
struct afs_net *net, struct afs_net *net,
struct afs_fid *fid, struct afs_fid *fid,
struct afs_status_cb *scb, struct afs_status_cb *scb,
...@@ -1888,7 +1888,7 @@ static const struct afs_call_type yfs_RXYFSInlineBulkStatus = { ...@@ -1888,7 +1888,7 @@ static const struct afs_call_type yfs_RXYFSInlineBulkStatus = {
/* /*
* Fetch the status information for up to 1024 files * Fetch the status information for up to 1024 files
*/ */
int yfs_fs_inline_bulk_status(struct afs_fs_cursor *fc, int yfs_fs_inline_bulk_status(struct afs_operation *fc,
struct afs_net *net, struct afs_net *net,
struct afs_fid *fids, struct afs_fid *fids,
struct afs_status_cb *statuses, struct afs_status_cb *statuses,
...@@ -2065,7 +2065,7 @@ static const struct afs_call_type yfs_RXYFSFetchOpaqueACL = { ...@@ -2065,7 +2065,7 @@ static const struct afs_call_type yfs_RXYFSFetchOpaqueACL = {
/* /*
* Fetch the YFS advanced ACLs for a file. * Fetch the YFS advanced ACLs for a file.
*/ */
struct yfs_acl *yfs_fs_fetch_opaque_acl(struct afs_fs_cursor *fc, struct yfs_acl *yfs_fs_fetch_opaque_acl(struct afs_operation *fc,
struct yfs_acl *yacl, struct yfs_acl *yacl,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
...@@ -2119,7 +2119,7 @@ static const struct afs_call_type yfs_RXYFSStoreOpaqueACL2 = { ...@@ -2119,7 +2119,7 @@ static const struct afs_call_type yfs_RXYFSStoreOpaqueACL2 = {
/* /*
* Fetch the YFS ACL for a file. * Fetch the YFS ACL for a file.
*/ */
int yfs_fs_store_opaque_acl2(struct afs_fs_cursor *fc, const struct afs_acl *acl, int yfs_fs_store_opaque_acl2(struct afs_operation *fc, const struct afs_acl *acl,
struct afs_status_cb *scb) struct afs_status_cb *scb)
{ {
struct afs_vnode *vnode = fc->vnode; struct afs_vnode *vnode = fc->vnode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7