Skip to content

Commit 05580bb

Browse files
jtlaytonbrauner
jtlayton
authored and
brauner
committed
nfsd: adapt to breakup of struct file_lock
Most of the existing APIs have remained the same, but subsystems that access file_lock fields directly need to reach into struct file_lock_core now. Signed-off-by: Jeff Layton <jlayton@kernel.org> Link: https://lore.kernel.org/r/20240131-flsplit-v3-42-c6129007ee8d@kernel.org Reviewed-by: NeilBrown <neilb@suse.de> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent dd1fac6 commit 05580bb

5 files changed

Lines changed: 46 additions & 45 deletions

File tree

‎fs/nfsd/filecache.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,8 @@ nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,
662662
struct file_lock *fl = data;
663663

664664
/* Only close files for F_SETLEASE leases */
665-
if (fl->fl_flags & FL_LEASE)
666-
nfsd_file_close_inode(file_inode(fl->fl_file));
665+
if (fl->c.flc_flags & FL_LEASE)
666+
nfsd_file_close_inode(file_inode(fl->c.flc_file));
667667
return 0;
668668
}
669669

‎fs/nfsd/netns.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <net/net_namespace.h>
1212
#include <net/netns/generic.h>
13-
#define _NEED_FILE_LOCK_FIELD_MACROS
1413
#include <linux/filelock.h>
1514
#include <linux/percpu_counter.h>
1615
#include <linux/siphash.h>

‎fs/nfsd/nfs4callback.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ static void nfs4_xdr_enc_cb_notify_lock(struct rpc_rqst *req,
674674
const struct nfsd4_callback *cb = data;
675675
const struct nfsd4_blocked_lock *nbl =
676676
container_of(cb, struct nfsd4_blocked_lock, nbl_cb);
677-
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)nbl->nbl_lock.fl_owner;
677+
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)nbl->nbl_lock.c.flc_owner;
678678
struct nfs4_cb_compound_hdr hdr = {
679679
.ident = 0,
680680
.minorversion = cb->cb_clp->cl_minorversion,

‎fs/nfsd/nfs4layouts.c‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,15 @@ nfsd4_layout_setlease(struct nfs4_layout_stateid *ls)
193193
return -ENOMEM;
194194
locks_init_lock(fl);
195195
fl->fl_lmops = &nfsd4_layouts_lm_ops;
196-
fl->fl_flags = FL_LAYOUT;
197-
fl->fl_type = F_RDLCK;
196+
fl->c.flc_flags = FL_LAYOUT;
197+
fl->c.flc_type = F_RDLCK;
198198
fl->fl_end = OFFSET_MAX;
199-
fl->fl_owner = ls;
200-
fl->fl_pid = current->tgid;
201-
fl->fl_file = ls->ls_file->nf_file;
199+
fl->c.flc_owner = ls;
200+
fl->c.flc_pid = current->tgid;
201+
fl->c.flc_file = ls->ls_file->nf_file;
202202

203-
status = vfs_setlease(fl->fl_file, fl->fl_type, &fl, NULL);
203+
status = vfs_setlease(fl->c.flc_file, fl->c.flc_type, &fl,
204+
NULL);
204205
if (status) {
205206
locks_free_lock(fl);
206207
return status;
@@ -731,7 +732,7 @@ nfsd4_layout_lm_break(struct file_lock *fl)
731732
* in time:
732733
*/
733734
fl->fl_break_time = 0;
734-
nfsd4_recall_file_layout(fl->fl_owner);
735+
nfsd4_recall_file_layout(fl->c.flc_owner);
735736
return false;
736737
}
737738

‎fs/nfsd/nfs4state.c‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4924,7 +4924,7 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp)
49244924
static bool
49254925
nfsd_break_deleg_cb(struct file_lock *fl)
49264926
{
4927-
struct nfs4_delegation *dp = (struct nfs4_delegation *)fl->fl_owner;
4927+
struct nfs4_delegation *dp = (struct nfs4_delegation *) fl->c.flc_owner;
49284928
struct nfs4_file *fp = dp->dl_stid.sc_file;
49294929
struct nfs4_client *clp = dp->dl_stid.sc_client;
49304930
struct nfsd_net *nn;
@@ -4962,7 +4962,7 @@ nfsd_break_deleg_cb(struct file_lock *fl)
49624962
*/
49634963
static bool nfsd_breaker_owns_lease(struct file_lock *fl)
49644964
{
4965-
struct nfs4_delegation *dl = fl->fl_owner;
4965+
struct nfs4_delegation *dl = fl->c.flc_owner;
49664966
struct svc_rqst *rqst;
49674967
struct nfs4_client *clp;
49684968

@@ -4980,7 +4980,7 @@ static int
49804980
nfsd_change_deleg_cb(struct file_lock *onlist, int arg,
49814981
struct list_head *dispose)
49824982
{
4983-
struct nfs4_delegation *dp = (struct nfs4_delegation *)onlist->fl_owner;
4983+
struct nfs4_delegation *dp = (struct nfs4_delegation *) onlist->c.flc_owner;
49844984
struct nfs4_client *clp = dp->dl_stid.sc_client;
49854985

49864986
if (arg & F_UNLCK) {
@@ -5340,12 +5340,12 @@ static struct file_lock *nfs4_alloc_init_lease(struct nfs4_delegation *dp,
53405340
if (!fl)
53415341
return NULL;
53425342
fl->fl_lmops = &nfsd_lease_mng_ops;
5343-
fl->fl_flags = FL_DELEG;
5344-
fl->fl_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;
5343+
fl->c.flc_flags = FL_DELEG;
5344+
fl->c.flc_type = flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK;
53455345
fl->fl_end = OFFSET_MAX;
5346-
fl->fl_owner = (fl_owner_t)dp;
5347-
fl->fl_pid = current->tgid;
5348-
fl->fl_file = dp->dl_stid.sc_file->fi_deleg_file->nf_file;
5346+
fl->c.flc_owner = (fl_owner_t)dp;
5347+
fl->c.flc_pid = current->tgid;
5348+
fl->c.flc_file = dp->dl_stid.sc_file->fi_deleg_file->nf_file;
53495349
return fl;
53505350
}
53515351

@@ -5533,7 +5533,8 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
55335533
if (!fl)
55345534
goto out_clnt_odstate;
55355535

5536-
status = vfs_setlease(fp->fi_deleg_file->nf_file, fl->fl_type, &fl, NULL);
5536+
status = vfs_setlease(fp->fi_deleg_file->nf_file,
5537+
fl->c.flc_type, &fl, NULL);
55375538
if (fl)
55385539
locks_free_lock(fl);
55395540
if (status)
@@ -7149,7 +7150,7 @@ nfsd4_lm_put_owner(fl_owner_t owner)
71497150
static bool
71507151
nfsd4_lm_lock_expirable(struct file_lock *cfl)
71517152
{
7152-
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)cfl->fl_owner;
7153+
struct nfs4_lockowner *lo = (struct nfs4_lockowner *) cfl->c.flc_owner;
71537154
struct nfs4_client *clp = lo->lo_owner.so_client;
71547155
struct nfsd_net *nn;
71557156

@@ -7171,7 +7172,7 @@ nfsd4_lm_expire_lock(void)
71717172
static void
71727173
nfsd4_lm_notify(struct file_lock *fl)
71737174
{
7174-
struct nfs4_lockowner *lo = (struct nfs4_lockowner *)fl->fl_owner;
7175+
struct nfs4_lockowner *lo = (struct nfs4_lockowner *) fl->c.flc_owner;
71757176
struct net *net = lo->lo_owner.so_client->net;
71767177
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
71777178
struct nfsd4_blocked_lock *nbl = container_of(fl,
@@ -7208,7 +7209,7 @@ nfs4_set_lock_denied(struct file_lock *fl, struct nfsd4_lock_denied *deny)
72087209
struct nfs4_lockowner *lo;
72097210

72107211
if (fl->fl_lmops == &nfsd_posix_mng_ops) {
7211-
lo = (struct nfs4_lockowner *) fl->fl_owner;
7212+
lo = (struct nfs4_lockowner *) fl->c.flc_owner;
72127213
xdr_netobj_dup(&deny->ld_owner, &lo->lo_owner.so_owner,
72137214
GFP_KERNEL);
72147215
if (!deny->ld_owner.data)
@@ -7227,7 +7228,7 @@ nfs4_set_lock_denied(struct file_lock *fl, struct nfsd4_lock_denied *deny)
72277228
if (fl->fl_end != NFS4_MAX_UINT64)
72287229
deny->ld_length = fl->fl_end - fl->fl_start + 1;
72297230
deny->ld_type = NFS4_READ_LT;
7230-
if (fl->fl_type != F_RDLCK)
7231+
if (fl->c.flc_type != F_RDLCK)
72317232
deny->ld_type = NFS4_WRITE_LT;
72327233
}
72337234

@@ -7615,11 +7616,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
76157616
}
76167617

76177618
file_lock = &nbl->nbl_lock;
7618-
file_lock->fl_type = type;
7619-
file_lock->fl_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(&lock_sop->lo_owner));
7620-
file_lock->fl_pid = current->tgid;
7621-
file_lock->fl_file = nf->nf_file;
7622-
file_lock->fl_flags = flags;
7619+
file_lock->c.flc_type = type;
7620+
file_lock->c.flc_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(&lock_sop->lo_owner));
7621+
file_lock->c.flc_pid = current->tgid;
7622+
file_lock->c.flc_file = nf->nf_file;
7623+
file_lock->c.flc_flags = flags;
76237624
file_lock->fl_lmops = &nfsd_posix_mng_ops;
76247625
file_lock->fl_start = lock->lk_offset;
76257626
file_lock->fl_end = last_byte_offset(lock->lk_offset, lock->lk_length);
@@ -7737,9 +7738,9 @@ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct
77377738
err = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
77387739
if (err)
77397740
goto out;
7740-
lock->fl_file = nf->nf_file;
7741+
lock->c.flc_file = nf->nf_file;
77417742
err = nfserrno(vfs_test_lock(nf->nf_file, lock));
7742-
lock->fl_file = NULL;
7743+
lock->c.flc_file = NULL;
77437744
out:
77447745
inode_unlock(inode);
77457746
nfsd_file_put(nf);
@@ -7784,11 +7785,11 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
77847785
switch (lockt->lt_type) {
77857786
case NFS4_READ_LT:
77867787
case NFS4_READW_LT:
7787-
file_lock->fl_type = F_RDLCK;
7788+
file_lock->c.flc_type = F_RDLCK;
77887789
break;
77897790
case NFS4_WRITE_LT:
77907791
case NFS4_WRITEW_LT:
7791-
file_lock->fl_type = F_WRLCK;
7792+
file_lock->c.flc_type = F_WRLCK;
77927793
break;
77937794
default:
77947795
dprintk("NFSD: nfs4_lockt: bad lock type!\n");
@@ -7798,9 +7799,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
77987799

77997800
lo = find_lockowner_str(cstate->clp, &lockt->lt_owner);
78007801
if (lo)
7801-
file_lock->fl_owner = (fl_owner_t)lo;
7802-
file_lock->fl_pid = current->tgid;
7803-
file_lock->fl_flags = FL_POSIX;
7802+
file_lock->c.flc_owner = (fl_owner_t)lo;
7803+
file_lock->c.flc_pid = current->tgid;
7804+
file_lock->c.flc_flags = FL_POSIX;
78047805

78057806
file_lock->fl_start = lockt->lt_offset;
78067807
file_lock->fl_end = last_byte_offset(lockt->lt_offset, lockt->lt_length);
@@ -7811,7 +7812,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
78117812
if (status)
78127813
goto out;
78137814

7814-
if (file_lock->fl_type != F_UNLCK) {
7815+
if (file_lock->c.flc_type != F_UNLCK) {
78157816
status = nfserr_denied;
78167817
nfs4_set_lock_denied(file_lock, &lockt->lt_denied);
78177818
}
@@ -7867,11 +7868,11 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
78677868
goto put_file;
78687869
}
78697870

7870-
file_lock->fl_type = F_UNLCK;
7871-
file_lock->fl_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(stp->st_stateowner));
7872-
file_lock->fl_pid = current->tgid;
7873-
file_lock->fl_file = nf->nf_file;
7874-
file_lock->fl_flags = FL_POSIX;
7871+
file_lock->c.flc_type = F_UNLCK;
7872+
file_lock->c.flc_owner = (fl_owner_t)lockowner(nfs4_get_stateowner(stp->st_stateowner));
7873+
file_lock->c.flc_pid = current->tgid;
7874+
file_lock->c.flc_file = nf->nf_file;
7875+
file_lock->c.flc_flags = FL_POSIX;
78757876
file_lock->fl_lmops = &nfsd_posix_mng_ops;
78767877
file_lock->fl_start = locku->lu_offset;
78777878

@@ -7927,7 +7928,7 @@ check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *lowner)
79277928
if (flctx && !list_empty_careful(&flctx->flc_posix)) {
79287929
spin_lock(&flctx->flc_lock);
79297930
for_each_file_lock(fl, &flctx->flc_posix) {
7930-
if (fl->fl_owner == (fl_owner_t)lowner) {
7931+
if (fl->c.flc_owner == (fl_owner_t)lowner) {
79317932
status = true;
79327933
break;
79337934
}
@@ -8456,7 +8457,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)
84568457
return 0;
84578458
spin_lock(&ctx->flc_lock);
84588459
for_each_file_lock(fl, &ctx->flc_lease) {
8459-
if (fl->fl_flags == FL_LAYOUT)
8460+
if (fl->c.flc_flags == FL_LAYOUT)
84608461
continue;
84618462
if (fl->fl_lmops != &nfsd_lease_mng_ops) {
84628463
/*
@@ -8469,7 +8470,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)
84698470
goto break_lease;
84708471
}
84718472
if (lock_is_write(fl)) {
8472-
dp = fl->fl_owner;
8473+
dp = fl->c.flc_owner;
84738474
if (dp->dl_recall.cb_clp == *(rqstp->rq_lease_breaker)) {
84748475
spin_unlock(&ctx->flc_lock);
84758476
return 0;

0 commit comments

Comments
 (0)