History

seqlock: Use raw_ prefix instead of _no_lockdep

Linus disliked the _no_lockdep() naming, so instead use the more-consistent raw_* prefix to the non-lockdep enabled seqcount methods. This also adds raw_ methods for the write operations as well, which will be utilized in a following patch.

John Stultz committed 12 years ago

Commit 0c3351d1 parent 228fdc02 files · +23 −12Browse files

Showing the changes to include (1 of 2 files). Show all

Unified · Split

include/linux/seqlock.h+19−8
@@ -117,15 +117,15 @@ repeat: · 116 unmodified lines
117117 }
118118
119119 /**
120− * read_seqcount_begin_no_lockdep - start seq-read critical section w/o lockdep
120+ * raw_read_seqcount_begin - start seq-read critical section w/o lockdep
121121 * @s: pointer to seqcount_t
122122 * Returns: count to be passed to read_seqcount_retry
123123 *
124− * read_seqcount_begin_no_lockdep opens a read critical section of the given
124+ * raw_read_seqcount_begin opens a read critical section of the given
125125 * seqcount, but without any lockdep checking. Validity of the critical
126126 * section is tested by checking read_seqcount_retry function.
127127 */
128−static inline unsigned read_seqcount_begin_no_lockdep(const seqcount_t *s)
128+static inline unsigned raw_read_seqcount_begin(const seqcount_t *s)
129129 {
130130 unsigned ret = __read_seqcount_begin(s);
131131 smp_rmb();
@@ -144,7 +144,7 @@ static inline unsigned read_seqcount_begin_no_lockdep(const seqcount_t *s) · 12 unmodified lines
144144 static inline unsigned read_seqcount_begin(const seqcount_t *s)
145145 {
146146 seqcount_lockdep_reader_access(s);
147− return read_seqcount_begin_no_lockdep(s);
147+ return raw_read_seqcount_begin(s);
148148 }
149149
150150 /**
@@ -206,14 +206,26 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start) · 55 unmodified lines
206206 }
207207
208208
209+
210+static inline void raw_write_seqcount_begin(seqcount_t *s)
211+{
212+ s->sequence++;
213+ smp_wmb();
214+}
215+
216+static inline void raw_write_seqcount_end(seqcount_t *s)
217+{
218+ smp_wmb();
219+ s->sequence++;
220+}
221+
209222 /*
210223 * Sequence counter only version assumes that callers are using their
211224 * own mutexing.
212225 */
213226 static inline void write_seqcount_begin_nested(seqcount_t *s, int subclass)
214227 {
215− s->sequence++;
216− smp_wmb();
228+ raw_write_seqcount_begin(s);
217229 seqcount_acquire(&s->dep_map, subclass, 0, _RET_IP_);
218230 }
219231
@@ -225,8 +237,7 @@ static inline void write_seqcount_begin(seqcount_t *s) · 5 unmodified lines
225237 static inline void write_seqcount_end(seqcount_t *s)
226238 {
227239 seqcount_release(&s->dep_map, 1, _RET_IP_);
228− smp_wmb();
229− s->sequence++;
240+ raw_write_seqcount_end(s);
230241 }
231242
232243 /**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t