History

pnfs: support for non-rpc layout drivers

Non-rpc layout driver such as for objects and blocks implement their own I/O path and error handling logic. Therefore bypass NFS-based error handling for these layout drivers. [fix lseg ref-count bugs, and null de-refs] [Fall out from: non-rpc layout drivers] Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> [get rid of PNFS_USE_RPC_CODE] [get rid of __nfs4_write_done_cb] [revert useless change in nfs4_write_done_cb] Signed-off-by: Benny Halevy <bhalevy@panasas.com>

Benny Halevy committed 15 years ago

Commit d20581a1 parent e51b8415 files · +62 −4Browse files

Unified · Split

5 files
  1. fs/nfs/internal.h +1 −0
  2. fs/nfs/nfs4proc.c +10 −3
  3. fs/nfs/pnfs.c +47 −1
  4. fs/nfs/pnfs.h +2 −0
  5. include/linux/nfs_xdr.h +2 −0
fs/nfs/internal.h+1−0
@@ -310,6 +310,7 @@ extern int nfs_migrate_page(struct address_space *, · 309 unmodified lines
310310 #endif
311311
312312 /* nfs4proc.c */
313+extern void __nfs4_read_done_cb(struct nfs_read_data *);
313314 extern void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data);
314315 extern int nfs4_init_client(struct nfs_client *clp,
315316 const struct rpc_timeout *timeparms,
fs/nfs/nfs4proc.c+10−3
@@ -3175,6 +3175,11 @@ static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, · 3174 unmodified lines
31753175 return err;
31763176 }
31773177
3178+void __nfs4_read_done_cb(struct nfs_read_data *data)
3179+{
3180+ nfs_invalidate_atime(data->inode);
3181+}
3182+
31783183 static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_read_data *data)
31793184 {
31803185 struct nfs_server *server = NFS_SERVER(data->inode);
@@ -3184,7 +3189,7 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_read_data *data) · 3 unmodified lines
31843189 return -EAGAIN;
31853190 }
31863191
3187− nfs_invalidate_atime(data->inode);
3192+ __nfs4_read_done_cb(data);
31883193 if (task->tk_status > 0)
31893194 renew_lease(server, data->timestamp);
31903195 return 0;
@@ -3198,7 +3203,8 @@ static int nfs4_read_done(struct rpc_task *task, struct nfs_read_data *data) · 7 unmodified lines
31983203 if (!nfs4_sequence_done(task, &data->res.seq_res))
31993204 return -EAGAIN;
32003205
3201− return data->read_done_cb(task, data);
3206+ return data->read_done_cb ? data->read_done_cb(task, data) :
3207+ nfs4_read_done_cb(task, data);
32023208 }
32033209
32043210 static void nfs4_proc_read_setup(struct nfs_read_data *data, struct rpc_message *msg)
@@ -3243,7 +3249,8 @@ static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data) · 38 unmodified lines
32433249 {
32443250 if (!nfs4_sequence_done(task, &data->res.seq_res))
32453251 return -EAGAIN;
3246− return data->write_done_cb(task, data);
3252+ return data->write_done_cb ? data->write_done_cb(task, data) :
3253+ nfs4_write_done_cb(task, data);
32473254 }
32483255
32493256 /* Reset the the nfs_write_data to send the write to the MDS. */
fs/nfs/pnfs.c+47−1
@@ -243,7 +243,7 @@ put_lseg_common(struct pnfs_layout_segment *lseg) · 242 unmodified lines
243243 {
244244 struct inode *inode = lseg->pls_layout->plh_inode;
245245
246− BUG_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
246+ WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags));
247247 list_del_init(&lseg->pls_list);
248248 if (list_empty(&lseg->pls_layout->plh_segs)) {
249249 set_bit(NFS_LAYOUT_DESTROYED, &lseg->pls_layout->plh_flags);
@@ -1054,6 +1054,29 @@ pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode) · 804 unmodified lines
10541054 pgio->pg_test = (ld && ld->pg_test) ? pnfs_write_pg_test : NULL;
10551055 }
10561056
1057+/*
1058+ * Called by non rpc-based layout drivers
1059+ */
1060+int
1061+pnfs_ld_write_done(struct nfs_write_data *data)
1062+{
1063+ int status;
1064+
1065+ if (!data->pnfs_error) {
1066+ pnfs_set_layoutcommit(data);
1067+ data->mds_ops->rpc_call_done(&data->task, data);
1068+ data->mds_ops->rpc_release(data);
1069+ return 0;
1070+ }
1071+
1072+ dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
1073+ data->pnfs_error);
1074+ status = nfs_initiate_write(data, NFS_CLIENT(data->inode),
1075+ data->mds_ops, NFS_FILE_SYNC);
1076+ return status ? : -EAGAIN;
1077+}
1078+EXPORT_SYMBOL_GPL(pnfs_ld_write_done);
1079+
10571080 enum pnfs_try_status
10581081 pnfs_try_to_write_data(struct nfs_write_data *wdata,
10591082 const struct rpc_call_ops *call_ops, int how)
@@ -1078,6 +1101,29 @@ pnfs_try_to_write_data(struct nfs_write_data *wdata, · 18 unmodified lines
10781101 return trypnfs;
10791102 }
10801103
1104+/*
1105+ * Called by non rpc-based layout drivers
1106+ */
1107+int
1108+pnfs_ld_read_done(struct nfs_read_data *data)
1109+{
1110+ int status;
1111+
1112+ if (!data->pnfs_error) {
1113+ __nfs4_read_done_cb(data);
1114+ data->mds_ops->rpc_call_done(&data->task, data);
1115+ data->mds_ops->rpc_release(data);
1116+ return 0;
1117+ }
1118+
1119+ dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
1120+ data->pnfs_error);
1121+ status = nfs_initiate_read(data, NFS_CLIENT(data->inode),
1122+ data->mds_ops);
1123+ return status ? : -EAGAIN;
1124+}
1125+EXPORT_SYMBOL_GPL(pnfs_ld_read_done);
1126+
10811127 /*
10821128 * Call the appropriate parallel I/O subsystem read function.
10831129 */
fs/nfs/pnfs.h+2−0
@@ -165,6 +165,8 @@ void pnfs_roc_set_barrier(struct inode *ino, u32 barrier); · 164 unmodified lines
165165 bool pnfs_roc_drain(struct inode *ino, u32 *barrier);
166166 void pnfs_set_layoutcommit(struct nfs_write_data *wdata);
167167 int pnfs_layoutcommit_inode(struct inode *inode, bool sync);
168+int pnfs_ld_write_done(struct nfs_write_data *);
169+int pnfs_ld_read_done(struct nfs_read_data *);
168170
169171 /* pnfs_dev.c */
170172 struct nfs4_deviceid_node {
include/linux/nfs_xdr.h+2−0
@@ -1087,6 +1087,7 @@ struct nfs_read_data { · 1086 unmodified lines
10871087 const struct rpc_call_ops *mds_ops;
10881088 int (*read_done_cb) (struct rpc_task *task, struct nfs_read_data *data);
10891089 __u64 mds_offset;
1090+ int pnfs_error;
10901091 struct page *page_array[NFS_PAGEVEC_SIZE];
10911092 };
10921093
@@ -1112,6 +1113,7 @@ struct nfs_write_data { · 19 unmodified lines
11121113 unsigned long timestamp; /* For lease renewal */
11131114 #endif
11141115 __u64 mds_offset; /* Filelayout dense stripe */
1116+ int pnfs_error;
11151117 struct page *page_array[NFS_PAGEVEC_SIZE];
11161118 };
11171119