1313
1414#define NFSDBG_FACILITY NFSDBG_PNFS_LD
1515
16+ static void bl_unregister_scsi (struct pnfs_block_dev * dev )
17+ {
18+ struct block_device * bdev = file_bdev (dev -> bdev_file );
19+ const struct pr_ops * ops = bdev -> bd_disk -> fops -> pr_ops ;
20+
21+ if (!test_and_clear_bit (PNFS_BDEV_REGISTERED , & dev -> flags ))
22+ return ;
23+
24+ if (ops -> pr_register (bdev , dev -> pr_key , 0 , false))
25+ pr_err ("failed to unregister PR key.\n" );
26+ }
27+
28+ static bool bl_register_scsi (struct pnfs_block_dev * dev )
29+ {
30+ struct block_device * bdev = file_bdev (dev -> bdev_file );
31+ const struct pr_ops * ops = bdev -> bd_disk -> fops -> pr_ops ;
32+ int status ;
33+
34+ if (test_and_set_bit (PNFS_BDEV_REGISTERED , & dev -> flags ))
35+ return true;
36+
37+ status = ops -> pr_register (bdev , 0 , dev -> pr_key , true);
38+ if (status ) {
39+ pr_err ("pNFS: failed to register key for block device %s." ,
40+ bdev -> bd_disk -> disk_name );
41+ return false;
42+ }
43+ return true;
44+ }
45+
46+ static void bl_unregister_dev (struct pnfs_block_dev * dev )
47+ {
48+ u32 i ;
49+
50+ if (dev -> nr_children ) {
51+ for (i = 0 ; i < dev -> nr_children ; i ++ )
52+ bl_unregister_dev (& dev -> children [i ]);
53+ return ;
54+ }
55+
56+ if (dev -> type == PNFS_BLOCK_VOLUME_SCSI )
57+ bl_unregister_scsi (dev );
58+ }
59+
60+ bool bl_register_dev (struct pnfs_block_dev * dev )
61+ {
62+ u32 i ;
63+
64+ if (dev -> nr_children ) {
65+ for (i = 0 ; i < dev -> nr_children ; i ++ ) {
66+ if (!bl_register_dev (& dev -> children [i ])) {
67+ while (i > 0 )
68+ bl_unregister_dev (& dev -> children [-- i ]);
69+ return false;
70+ }
71+ }
72+ return true;
73+ }
74+
75+ if (dev -> type == PNFS_BLOCK_VOLUME_SCSI )
76+ return bl_register_scsi (dev );
77+ return true;
78+ }
79+
1680static void
1781bl_free_device (struct pnfs_block_dev * dev )
1882{
83+ bl_unregister_dev (dev );
84+
1985 if (dev -> nr_children ) {
2086 int i ;
2187
2288 for (i = 0 ; i < dev -> nr_children ; i ++ )
2389 bl_free_device (& dev -> children [i ]);
2490 kfree (dev -> children );
2591 } else {
26- if (dev -> pr_registered ) {
27- const struct pr_ops * ops =
28- file_bdev (dev -> bdev_file )-> bd_disk -> fops -> pr_ops ;
29- int error ;
30-
31- error = ops -> pr_register (file_bdev (dev -> bdev_file ),
32- dev -> pr_key , 0 , false);
33- if (error )
34- pr_err ("failed to unregister PR key.\n" );
35- }
36-
3792 if (dev -> bdev_file )
3893 fput (dev -> bdev_file );
3994 }
@@ -365,14 +420,6 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,
365420 goto out_blkdev_put ;
366421 }
367422
368- error = ops -> pr_register (file_bdev (d -> bdev_file ), 0 , d -> pr_key , true);
369- if (error ) {
370- pr_err ("pNFS: failed to register key for block device %s." ,
371- file_bdev (d -> bdev_file )-> bd_disk -> disk_name );
372- goto out_blkdev_put ;
373- }
374-
375- d -> pr_registered = true;
376423 return 0 ;
377424
378425out_blkdev_put :
@@ -458,7 +505,9 @@ static int
458505bl_parse_deviceid (struct nfs_server * server , struct pnfs_block_dev * d ,
459506 struct pnfs_block_volume * volumes , int idx , gfp_t gfp_mask )
460507{
461- switch (volumes [idx ].type ) {
508+ d -> type = volumes [idx ].type ;
509+
510+ switch (d -> type ) {
462511 case PNFS_BLOCK_VOLUME_SIMPLE :
463512 return bl_parse_simple (server , d , volumes , idx , gfp_mask );
464513 case PNFS_BLOCK_VOLUME_SLICE :
@@ -470,7 +519,7 @@ bl_parse_deviceid(struct nfs_server *server, struct pnfs_block_dev *d,
470519 case PNFS_BLOCK_VOLUME_SCSI :
471520 return bl_parse_scsi (server , d , volumes , idx , gfp_mask );
472521 default :
473- dprintk ("unsupported volume type: %d\n" , volumes [ idx ]. type );
522+ dprintk ("unsupported volume type: %d\n" , d -> type );
474523 return - EIO ;
475524 }
476525}
0 commit comments