Skip to contentSkip to conversation

SQUASHME: Compile warning in pnfs-all-3.1-2011-10-31-1

PATCH In review Boaz Harrosh 2 participants 2 messages Nov 7, 2011 – Nov 10, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SQUASHME: Compile warning in pnfs-all-3.1-2011-10-31-1

Fix this:
fs/nfsd/nfs4pnfsd.c: In function 'cl_has_file_layout':
fs/nfsd/nfs4pnfsd.c:1093:20: warning: unused variable 'stid' [-Wunused-variable]

Was something forgotten? or It's really not needed any longer?

---
 fs/nfsd/nfs4pnfsd.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
fs/nfsd/nfs4pnfsd.c +0 -1
index d2860c9..ca5c18a 100644
@@ -1090,7 +1090,6 @@ int nfs4_pnfs_return_layout(struct super_block *sb, struct svc_fh *current_fh,
 static bool
 cl_has_file_layout(struct nfs4_client *clp, struct nfs4_file *fp, stateid_t *lsid)
 {
-	struct nfs4_stid *stid;
 	struct nfs4_layout_state *ls;
 
 	spin_lock(&layout_lock);
Signature · 1 line
1.7.6.4
#1 lore raw
Quoted 6 lines · Boaz Harrosh

Fix this:
fs/nfsd/nfs4pnfsd.c: In function 'cl_has_file_layout':
fs/nfsd/nfs4pnfsd.c:1093:20: warning: unused variable 'stid' [-Wunused-variable]

Was something forgotten? or It's really not needed any longer?

It isn't needed anymore post f2ed73ef28b85cb2abc9da6ca98a03daf4b36d0d which searches for clientid on the nfs4_file's fi_layout_states list.

Thanks!

Benny

Quoted 18 lines
---
 fs/nfsd/nfs4pnfsd.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
fs/nfsd/nfs4pnfsd.c +0 -1
index d2860c9..ca5c18a 100644
@@ -1090,7 +1090,6 @@ int nfs4_pnfs_return_layout(struct super_block *sb, struct svc_fh *current_fh,
 static bool
 cl_has_file_layout(struct nfs4_client *clp, struct nfs4_file *fp, stateid_t *lsid)
 {
-	struct nfs4_stid *stid;
 	struct nfs4_layout_state *ls;
 
 	spin_lock(&layout_lock);