diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 09:50:33 -0800 |
| commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
| tree | 726e49653f7014bea034c59624ea23c21d6df13f /fs/nfs/pnfs.c | |
| parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
| download | talos-obmc-linux-c2d8c259bfce056437e8dbc4b048944050f9b567.tar.gz talos-obmc-linux-c2d8c259bfce056437e8dbc4b048944050f9b567.zip | |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
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 fe624c91bd00..2878f97bd78d 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; |
