diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-08-21 11:09:18 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-10 12:47:01 -0700 |
| commit | 1013df61150e56f775ccacdaaeee66042f1e6eb6 (patch) | |
| tree | 1ebca856acca78d719a6c477b8f288d732804856 /fs/nfs/pnfs.c | |
| parent | 2e11f8296d22134c4fca7eb022eea2b09facd307 (diff) | |
| download | lwn-1013df61150e56f775ccacdaaeee66042f1e6eb6.tar.gz lwn-1013df61150e56f775ccacdaaeee66042f1e6eb6.zip | |
pnfs: do not pass uninitialized lsegs to ->free_lseg
Ensure the lsegs are initialized early so that we don't pass an unitialized
one back to ->free_lseg during error processing.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index a6586cdee211..0e0364ca877d 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1358,6 +1358,9 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) goto out; } + init_lseg(lo, lseg); + lseg->pls_range = res->range; + spin_lock(&ino->i_lock); if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) { dprintk("%s forget reply due to recall\n", __func__); @@ -1375,8 +1378,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) /* Done processing layoutget. Set the layout stateid */ pnfs_set_layout_stateid(lo, &res->stateid, false); - init_lseg(lo, lseg); - lseg->pls_range = res->range; pnfs_get_lseg(lseg); pnfs_layout_insert_lseg(lo, lseg); |