All of lore.kernel.org
 help / color / mirror / Atom feed
From: Douglas Gilbert <dgilbert@interlog.com>
To: linux-scsi@vger.kernel.org
Cc: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com,
	hare@suse.de, kashyap.desai@broadcom.com
Subject: [PATCH v15 32/45] sg: add some __must_hold macros
Date: Mon, 25 Jan 2021 14:11:09 -0500	[thread overview]
Message-ID: <20210125191122.345858-33-dgilbert@interlog.com> (raw)
In-Reply-To: <20210125191122.345858-1-dgilbert@interlog.com>

In the case of sg_wait_open_event() which calls mutex_unlock on
sdp->open_rel_lock and later calls mutex_lock on the same
lock; this macro is needed to stop sparse complaining. In
other cases it is a reminder to the coder (a precondition).

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
 drivers/scsi/sg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 4f5604e5b2ba..c7eda0f81b07 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -375,6 +375,7 @@ sg_check_file_access(struct file *filp, const char *caller)
 
 static int
 sg_wait_open_event(struct sg_device *sdp, bool o_excl)
+		__must_hold(sdp->open_rel_lock)
 {
 	int res = 0;
 
@@ -1740,6 +1741,7 @@ sg_ctl_sg_io(struct file *filp, struct sg_device *sdp, struct sg_fd *sfp,
  */
 static int
 sg_set_reserved_sz(struct sg_fd *sfp, int want_rsv_sz)
+		__must_hold(sfp->f_mutex)
 {
 	bool use_new_srp = false;
 	int res = 0;
@@ -3696,12 +3698,12 @@ sg_remove_sfp(struct kref *kref)
 
 static int
 sg_idr_max_id(int id, void *p, void *data)
+		__must_hold(sg_index_lock)
 {
 	int *k = data;
 
 	if (*k < id)
 		*k = id;
-
 	return 0;
 }
 
@@ -4004,6 +4006,7 @@ sg_proc_seq_show_devstrs(struct seq_file *s, void *v)
 /* Writes debug info for one sg_request in obp buffer */
 static int
 sg_proc_debug_sreq(struct sg_request *srp, int to, char *obp, int len)
+		__must_hold(sfp->srp_arr.xa_lock)
 {
 	bool is_v3v4, v4, is_dur;
 	int n = 0;
@@ -4106,6 +4109,7 @@ sg_proc_debug_fd(struct sg_fd *fp, char *obp, int len, unsigned long idx)
 /* Writes debug info for one sg device (including its sg fds) in obp buffer */
 static int
 sg_proc_debug_sdev(struct sg_device *sdp, char *obp, int len, int *fd_counterp)
+		__must_hold(sg_index_lock)
 {
 	int n = 0;
 	int my_count = 0;
-- 
2.25.1


  parent reply	other threads:[~2021-01-26 19:55 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-25 19:10 [PATCH v15 00/45] sg: add v4 interface Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 01/45] sg: move functions around Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 02/45] sg: remove typedefs, type+formatting cleanup Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 03/45] sg: sg_log and is_enabled Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 04/45] sg: rework sg_poll(), minor changes Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 05/45] sg: bitops in sg_device Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 06/45] sg: make open count an atomic Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 07/45] sg: move header to uapi section Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 08/45] sg: speed sg_poll and sg_get_num_waiting Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 09/45] sg: sg_allow_if_err_recovery and renames Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 10/45] sg: improve naming Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 11/45] sg: change rwlock to spinlock Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 12/45] sg: ioctl handling Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 13/45] sg: split sg_read Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 14/45] sg: sg_common_write add structure for arguments Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 15/45] sg: rework sg_vma_fault Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 16/45] sg: rework sg_mmap Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 17/45] sg: replace sg_allow_access Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 18/45] sg: rework scatter gather handling Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 19/45] sg: introduce request state machine Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 20/45] sg: sg_find_srp_by_id Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 21/45] sg: sg_fill_request_element Douglas Gilbert
2021-01-25 19:10 ` [PATCH v15 22/45] sg: printk change %p to %pK Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 23/45] sg: xarray for fds in device Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 24/45] sg: xarray for reqs in fd Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 25/45] sg: replace rq array with xarray Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 26/45] sg: sense buffer rework Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 27/45] sg: add sg v4 interface support Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 28/45] sg: rework debug info Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 29/45] sg: add 8 byte SCSI LUN to sg_scsi_id Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 30/45] sg: expand sg_comm_wr_t Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 31/45] sg: add sg_iosubmit_v3 and sg_ioreceive_v3 ioctls Douglas Gilbert
2021-01-25 19:11 ` Douglas Gilbert [this message]
2021-01-25 19:11 ` [PATCH v15 33/45] sg: move procfs objects to avoid forward decls Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 34/45] sg: protect multiple receivers Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 35/45] sg: first debugfs support Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 36/45] sg: rework mmap support Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 37/45] sg: defang allow_dio Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 38/45] sg: warn v3 write system call users Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 39/45] sg: add mmap_sz tracking Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 40/45] sg: remove rcv_done request state Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 41/45] sg: track lowest inactive and await indexes Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 42/45] sg: remove unit attention check for device changed Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 43/45] sg: no_dxfer: move to/from kernel buffers Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 44/45] sg: add blk_poll support Douglas Gilbert
2021-01-25 19:11 ` [PATCH v15 45/45] sg: bump version to 4.0.12 Douglas Gilbert
2021-01-27  4:56 ` [PATCH v15 00/45] sg: add v4 interface Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210125191122.345858-33-dgilbert@interlog.com \
    --to=dgilbert@interlog.com \
    --cc=hare@suse.de \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=kashyap.desai@broadcom.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.