diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
| commit | d3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (patch) | |
| tree | f0862d1905a599cdbad86fcc8816d86a6f33459f /fs/nfs/pnfs.c | |
| parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index fe624c91bd0..2878f97bd78 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -925,8 +925,8 @@ pnfs_find_alloc_layout(struct inode *ino, if (likely(nfsi->layout == NULL)) { /* Won the race? */ nfsi->layout = new; return new; - } - pnfs_free_layout_hdr(new); + } else if (new != NULL) + pnfs_free_layout_hdr(new); out_existing: pnfs_get_layout_hdr(nfsi->layout); return nfsi->layout; |