pnfs-obj: Must return layout on IO error

commit fe0fe83585f88346557868a803a479dfaaa0688a upstream.

As mandated by the standard. In case of an IO error, a pNFS
objects layout driver must return it's layout. This is because
all device errors are reported to the server as part of the
layout return buffer.

This is implemented the same way PNFS_LAYOUTRET_ON_SETATTR
is done, through a bit flag on the pnfs_layoutdriver_type->flags
member. The flag is set by the layout driver that wants a
layout_return preformed at pnfs_ld_{write,read}_done in case
of an error.
(Though I have not defined a wrapper like pnfs_ld_layoutret_on_setattr
 because this code is never called outside of pnfs.c and pnfs IO
 paths)

Without this patch 3.[0-2] Kernels leak memory and have an annoying
WARN_ON after every IO error utilizing the pnfs-obj driver.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 1d1dc1ee3943cbf115b389dff315b7e5c0f841b4..75fe694d78dea9c6604913ddb0c34258e8b1a276 100644 (file)
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -1006,7 +1006,8 @@ static bool objio_pg_test(struct nfs_pageio_descriptor *pgio,
 static struct pnfs_layoutdriver_type objlayout_type = {
        .id = LAYOUT_OSD2_OBJECTS,
        .name = "LAYOUT_OSD2_OBJECTS",
-       .flags                   = PNFS_LAYOUTRET_ON_SETATTR,
+       .flags                   = PNFS_LAYOUTRET_ON_SETATTR |
+                                  PNFS_LAYOUTRET_ON_ERROR,
 
        .alloc_layout_hdr        = objlayout_alloc_layout_hdr,
        .free_layout_hdr         = objlayout_free_layout_hdr,

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 36d2a29bfbedcb0e24fbded77770e5a062efdf80..99518872f42ccdbdd14180beb8c814bc315752ca 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1119,6 +1119,14 @@ pnfs_ld_write_done(struct nfs_write_data *data)
                data->mds_ops->rpc_release(data);
                return 0;
        }
+       if (NFS_SERVER(data->inode)->pnfs_curr_ld->flags &
+                                       PNFS_LAYOUTRET_ON_ERROR) {
+               /* Don't lo_commit on error, Server will needs to
+                * preform a file recovery.
+                */
+               clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(data->inode)->flags);
+               pnfs_return_layout(data->inode);
+       }
 
        dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
                data->pnfs_error);
@@ -1167,6 +1175,10 @@ pnfs_ld_read_done(struct nfs_read_data *data)
                return 0;
        }
 
+       if (NFS_SERVER(data->inode)->pnfs_curr_ld->flags &
+                                               PNFS_LAYOUTRET_ON_ERROR)
+               pnfs_return_layout(data->inode);
+
        dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
                data->pnfs_error);
        status = nfs_initiate_read(data, NFS_CLIENT(data->inode),

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 9d147d963bd950c44ca386c4a9d3a2a9647cbd49..bb8b3247f29c6fc37bfa3ee094923c13060ae582 100644 (file)
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -68,6 +68,7 @@ enum {
 enum layoutdriver_policy_flags {
        /* Should the pNFS client commit and return the layout upon a setattr */
        PNFS_LAYOUTRET_ON_SETATTR       = 1 << 0,
+       PNFS_LAYOUTRET_ON_ERROR         = 1 << 1,
 };
 
 struct nfs4_deviceid_node;