nfsd4: use a single struct file for delegations
When we converted to sharing struct filess between nfs4 opens I went too far and also used the same mechanism for delegations. But keeping a reference to the struct file ensures it will outlast the lease, and allows us to remove the lease with the same file as we added it. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
e63eb93750
commit
c84d500bc4
|
@ -230,7 +230,8 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f
|
||||||
dp->dl_client = clp;
|
dp->dl_client = clp;
|
||||||
get_nfs4_file(fp);
|
get_nfs4_file(fp);
|
||||||
dp->dl_file = fp;
|
dp->dl_file = fp;
|
||||||
nfs4_file_get_access(fp, O_RDONLY);
|
dp->dl_vfs_file = find_readable_file(fp);
|
||||||
|
get_file(dp->dl_vfs_file);
|
||||||
dp->dl_flock = NULL;
|
dp->dl_flock = NULL;
|
||||||
dp->dl_type = type;
|
dp->dl_type = type;
|
||||||
dp->dl_stateid.si_boot = boot_time;
|
dp->dl_stateid.si_boot = boot_time;
|
||||||
|
@ -252,6 +253,7 @@ nfs4_put_delegation(struct nfs4_delegation *dp)
|
||||||
if (atomic_dec_and_test(&dp->dl_count)) {
|
if (atomic_dec_and_test(&dp->dl_count)) {
|
||||||
dprintk("NFSD: freeing dp %p\n",dp);
|
dprintk("NFSD: freeing dp %p\n",dp);
|
||||||
put_nfs4_file(dp->dl_file);
|
put_nfs4_file(dp->dl_file);
|
||||||
|
fput(dp->dl_vfs_file);
|
||||||
kmem_cache_free(deleg_slab, dp);
|
kmem_cache_free(deleg_slab, dp);
|
||||||
num_delegations--;
|
num_delegations--;
|
||||||
}
|
}
|
||||||
|
@ -265,12 +267,10 @@ nfs4_put_delegation(struct nfs4_delegation *dp)
|
||||||
static void
|
static void
|
||||||
nfs4_close_delegation(struct nfs4_delegation *dp)
|
nfs4_close_delegation(struct nfs4_delegation *dp)
|
||||||
{
|
{
|
||||||
struct file *filp = find_readable_file(dp->dl_file);
|
|
||||||
|
|
||||||
dprintk("NFSD: close_delegation dp %p\n",dp);
|
dprintk("NFSD: close_delegation dp %p\n",dp);
|
||||||
|
/* XXX: do we even need this check?: */
|
||||||
if (dp->dl_flock)
|
if (dp->dl_flock)
|
||||||
vfs_setlease(filp, F_UNLCK, &dp->dl_flock);
|
vfs_setlease(dp->dl_vfs_file, F_UNLCK, &dp->dl_flock);
|
||||||
nfs4_file_put_access(dp->dl_file, O_RDONLY);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called under the state lock. */
|
/* Called under the state lock. */
|
||||||
|
|
|
@ -81,6 +81,7 @@ struct nfs4_delegation {
|
||||||
atomic_t dl_count; /* ref count */
|
atomic_t dl_count; /* ref count */
|
||||||
struct nfs4_client *dl_client;
|
struct nfs4_client *dl_client;
|
||||||
struct nfs4_file *dl_file;
|
struct nfs4_file *dl_file;
|
||||||
|
struct file *dl_vfs_file;
|
||||||
struct file_lock *dl_flock;
|
struct file_lock *dl_flock;
|
||||||
u32 dl_type;
|
u32 dl_type;
|
||||||
time_t dl_time;
|
time_t dl_time;
|
||||||
|
|
Loading…
Reference in a new issue