55 lines
2.6 KiB
Diff
55 lines
2.6 KiB
Diff
From 0bf0d69e1a358e93e5c9b256bb18cab4041e7d8f Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
||
Date: Sun, 11 Mar 2012 17:14:22 +0100
|
||
Subject: [PATCH RT] staging/pohmelfs: convert struct fs->lock usage to seq_spin_{,un}lock
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
This fixes:
|
||
|
||
drivers/staging/pohmelfs/path_entry.c:47:2: warning: passing argument 1 of ‘rt_spin_lock’ from incompatible pointer type [enabled by default]
|
||
include/linux/spinlock_rt.h:19:56: note: expected ‘struct spinlock_t *’ but argument is of type ‘struct seqlock_t *’
|
||
drivers/staging/pohmelfs/path_entry.c:49:2: warning: passing argument 1 of ‘rt_spin_unlock’ from incompatible pointer type [enabled by default]
|
||
include/linux/spinlock_rt.h:22:56: note: expected ‘struct spinlock_t *’ but argument is of type ‘struct seqlock_t *’
|
||
drivers/staging/pohmelfs/path_entry.c:95:2: warning: passing argument 1 of ‘rt_spin_lock’ from incompatible pointer type [enabled by default]
|
||
include/linux/spinlock_rt.h:19:56: note: expected ‘struct spinlock_t *’ but argument is of type ‘struct seqlock_t *’
|
||
drivers/staging/pohmelfs/path_entry.c:97:2: warning: passing argument 1 of ‘rt_spin_unlock’ from incompatible pointer type [enabled by default]
|
||
include/linux/spinlock_rt.h:22:56: note: expected ‘struct spinlock_t *’ but argument is of type ‘struct seqlock_t *’
|
||
|
||
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
||
Forwarded: http://mid.gmane.org/1331482999-32252-1-git-send-email-u.kleine-koenig@pengutronix.de
|
||
---
|
||
|
||
drivers/staging/pohmelfs/path_entry.c | 8 ++++----
|
||
1 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
||
diff --git a/drivers/staging/pohmelfs/path_entry.c b/drivers/staging/pohmelfs/path_entry.c
|
||
index 400a9fc..fc0c3fe 100644
|
||
--- a/drivers/staging/pohmelfs/path_entry.c
|
||
+++ b/drivers/staging/pohmelfs/path_entry.c
|
||
@@ -44,9 +44,9 @@ int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, int le
|
||
return -ENOENT;
|
||
}
|
||
|
||
- spin_lock(¤t->fs->lock);
|
||
+ seq_spin_lock(¤t->fs->lock);
|
||
path.mnt = mntget(current->fs->root.mnt);
|
||
- spin_unlock(¤t->fs->lock);
|
||
+ seq_spin_unlock(¤t->fs->lock);
|
||
|
||
path.dentry = d;
|
||
|
||
@@ -92,9 +92,9 @@ int pohmelfs_path_length(struct pohmelfs_inode *pi)
|
||
return -ENOENT;
|
||
}
|
||
|
||
- spin_lock(¤t->fs->lock);
|
||
+ seq_spin_lock(¤t->fs->lock);
|
||
root = dget(current->fs->root.dentry);
|
||
- spin_unlock(¤t->fs->lock);
|
||
+ seq_spin_unlock(¤t->fs->lock);
|
||
|
||
rename_retry:
|
||
len = 1; /* Root slash */
|