renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

nfs: modify update_changeattr to deal with regular files

Browse Source 
Until now, change attributes in change_info form were only returned by
directory operations. However, they are also used for the RFC 8276
extended attribute operations, which work on both directories
and regular files.  Modify update_changeattr to deal:

* Rename it to nfs4_update_changeattr and make it non-static.
* Don't always use INO_INVALID_DATA, this isn't needed for a
  directory that only had its extended attributes changed by us.
* Existing callers now always pass in INO_INVALID_DATA.

For the current callers of this function, behavior is unchanged.

Signed-off-by: Frank van der Linden <fllinden@amazon.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Frank van der Linden 2020-06-23 22:38:59 +00:00 committed by Trond Myklebust
parent 72832a2453
commit 1b523ca972
2 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/nfs4_fs.h
View File

@ -324,6 +324,11 @@ extern int update_open_stateid(struct nfs4_state *state,
extern int nfs4_proc_get_lease_time(struct nfs_client *clp, extern int nfs4_proc_get_lease_time(struct nfs_client *clp,
struct nfs_fsinfo *fsinfo); struct nfs_fsinfo *fsinfo);
extern void nfs4_update_changeattr(struct inode *dir,
struct nfs4_change_info *cinfo,
unsigned long timestamp,
unsigned long cache_validity);
#if defined(CONFIG_NFS_V4_1) #if defined(CONFIG_NFS_V4_1)
extern int nfs41_sequence_done(struct rpc_task *, struct nfs4_sequence_res *); extern int nfs41_sequence_done(struct rpc_task *, struct nfs4_sequence_res *);
extern int nfs4_proc_create_session(struct nfs_client *, const struct cred *); extern int nfs4_proc_create_session(struct nfs_client *, const struct cred *);

70
fs/nfs/nfs4proc.c
View File

@ -1158,37 +1158,48 @@ nfs4_dec_nlink_locked(struct inode *inode)
} }
static void static void
update_changeattr_locked(struct inode *dir, struct nfs4_change_info *cinfo, nfs4_update_changeattr_locked(struct inode *inode,
struct nfs4_change_info *cinfo,
unsigned long timestamp, unsigned long cache_validity) unsigned long timestamp, unsigned long cache_validity)
{ {
struct nfs_inode *nfsi = NFS_I(dir); struct nfs_inode *nfsi = NFS_I(inode);
nfsi->cache_validity |= NFS_INO_INVALID_CTIME nfsi->cache_validity |= NFS_INO_INVALID_CTIME
| NFS_INO_INVALID_MTIME | NFS_INO_INVALID_MTIME
| NFS_INO_INVALID_DATA
| cache_validity; | cache_validity;
if (cinfo->atomic && cinfo->before == inode_peek_iversion_raw(dir)) {
if (cinfo->atomic && cinfo->before == inode_peek_iversion_raw(inode)) {
nfsi->cache_validity &= ~NFS_INO_REVAL_PAGECACHE; nfsi->cache_validity &= ~NFS_INO_REVAL_PAGECACHE;
nfsi->attrtimeo_timestamp = jiffies; nfsi->attrtimeo_timestamp = jiffies;
} else { } else {
nfs_force_lookup_revalidate(dir); if (S_ISDIR(inode->i_mode)) {
if (cinfo->before != inode_peek_iversion_raw(dir)) nfsi->cache_validity |= NFS_INO_INVALID_DATA;
nfs_force_lookup_revalidate(inode);
} else {
if (!NFS_PROTO(inode)->have_delegation(inode,
FMODE_READ))
nfsi->cache_validity |= NFS_INO_REVAL_PAGECACHE;
}
if (cinfo->before != inode_peek_iversion_raw(inode))
nfsi->cache_validity |= NFS_INO_INVALID_ACCESS | nfsi->cache_validity |= NFS_INO_INVALID_ACCESS |
NFS_INO_INVALID_ACL; NFS_INO_INVALID_ACL;
} }
inode_set_iversion_raw(dir, cinfo->after); inode_set_iversion_raw(inode, cinfo->after);
nfsi->read_cache_jiffies = timestamp; nfsi->read_cache_jiffies = timestamp;
nfsi->attr_gencount = nfs_inc_attr_generation_counter(); nfsi->attr_gencount = nfs_inc_attr_generation_counter();
nfsi->cache_validity &= ~NFS_INO_INVALID_CHANGE; nfsi->cache_validity &= ~NFS_INO_INVALID_CHANGE;
nfs_fscache_invalidate(dir);
if (nfsi->cache_validity & NFS_INO_INVALID_DATA)
nfs_fscache_invalidate(inode);
} }
static void void
update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo, nfs4_update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo,
unsigned long timestamp, unsigned long cache_validity) unsigned long timestamp, unsigned long cache_validity)
{ {
spin_lock(&dir->i_lock); spin_lock(&dir->i_lock);
update_changeattr_locked(dir, cinfo, timestamp, cache_validity); nfs4_update_changeattr_locked(dir, cinfo, timestamp, cache_validity);
spin_unlock(&dir->i_lock); spin_unlock(&dir->i_lock);
} }
@ -2644,8 +2655,9 @@ static int _nfs4_proc_open(struct nfs4_opendata *data,
data->file_created = true; data->file_created = true;
if (data->file_created || if (data->file_created ||
inode_peek_iversion_raw(dir) != o_res->cinfo.after) inode_peek_iversion_raw(dir) != o_res->cinfo.after)
update_changeattr(dir, &o_res->cinfo, nfs4_update_changeattr(dir, &o_res->cinfo,
o_res->f_attr->time_start, 0); o_res->f_attr->time_start,
NFS_INO_INVALID_DATA);
} }
if ((o_res->rflags & NFS4_OPEN_RESULT_LOCKTYPE_POSIX) == 0) if ((o_res->rflags & NFS4_OPEN_RESULT_LOCKTYPE_POSIX) == 0)
server->caps &= ~NFS_CAP_POSIX_LOCK; server->caps &= ~NFS_CAP_POSIX_LOCK;
@ -4531,7 +4543,8 @@ _nfs4_proc_remove(struct inode *dir, const struct qstr *name, u32 ftype)
status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 1); status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 1);
if (status == 0) { if (status == 0) {
spin_lock(&dir->i_lock); spin_lock(&dir->i_lock);
update_changeattr_locked(dir, &res.cinfo, timestamp, 0); nfs4_update_changeattr_locked(dir, &res.cinfo, timestamp,
NFS_INO_INVALID_DATA);
/* Removing a directory decrements nlink in the parent */ /* Removing a directory decrements nlink in the parent */
if (ftype == NF4DIR && dir->i_nlink > 2) if (ftype == NF4DIR && dir->i_nlink > 2)
nfs4_dec_nlink_locked(dir); nfs4_dec_nlink_locked(dir);
@ -4615,8 +4628,9 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir)
&data->timeout) == -EAGAIN) &data->timeout) == -EAGAIN)
return 0; return 0;
if (task->tk_status == 0) if (task->tk_status == 0)
update_changeattr(dir, &res->cinfo, nfs4_update_changeattr(dir, &res->cinfo,
res->dir_attr->time_start, 0); res->dir_attr->time_start,
NFS_INO_INVALID_DATA);
return 1; return 1;
} }
@ -4660,16 +4674,18 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
if (task->tk_status == 0) { if (task->tk_status == 0) {
if (new_dir != old_dir) { if (new_dir != old_dir) {
/* Note: If we moved a directory, nlink will change */ /* Note: If we moved a directory, nlink will change */
update_changeattr(old_dir, &res->old_cinfo, nfs4_update_changeattr(old_dir, &res->old_cinfo,
res->old_fattr->time_start, res->old_fattr->time_start,
NFS_INO_INVALID_OTHER); NFS_INO_INVALID_OTHER |
update_changeattr(new_dir, &res->new_cinfo, NFS_INO_INVALID_DATA);
nfs4_update_changeattr(new_dir, &res->new_cinfo,
res->new_fattr->time_start, res->new_fattr->time_start,
NFS_INO_INVALID_OTHER); NFS_INO_INVALID_OTHER |
NFS_INO_INVALID_DATA);
} else } else
update_changeattr(old_dir, &res->old_cinfo, nfs4_update_changeattr(old_dir, &res->old_cinfo,
res->old_fattr->time_start, res->old_fattr->time_start,
0); NFS_INO_INVALID_DATA);
} }
return 1; return 1;
} }
@ -4710,7 +4726,8 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, const struct
status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1); status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1);
if (!status) { if (!status) {
update_changeattr(dir, &res.cinfo, res.fattr->time_start, 0); nfs4_update_changeattr(dir, &res.cinfo, res.fattr->time_start,
NFS_INO_INVALID_DATA);
status = nfs_post_op_update_inode(inode, res.fattr); status = nfs_post_op_update_inode(inode, res.fattr);
if (!status) if (!status)
nfs_setsecurity(inode, res.fattr, res.label); nfs_setsecurity(inode, res.fattr, res.label);
@ -4788,8 +4805,9 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
&data->arg.seq_args, &data->res.seq_res, 1); &data->arg.seq_args, &data->res.seq_res, 1);
if (status == 0) { if (status == 0) {
spin_lock(&dir->i_lock); spin_lock(&dir->i_lock);
update_changeattr_locked(dir, &data->res.dir_cinfo, nfs4_update_changeattr_locked(dir, &data->res.dir_cinfo,
data->res.fattr->time_start, 0); data->res.fattr->time_start,
NFS_INO_INVALID_DATA);
/* Creating a directory bumps nlink in the parent */ /* Creating a directory bumps nlink in the parent */
if (data->arg.ftype == NF4DIR) if (data->arg.ftype == NF4DIR)
nfs4_inc_nlink_locked(dir); nfs4_inc_nlink_locked(dir);