diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-20 00:23:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 16:29:55 -0700 |
| commit | 5f47c7eac65a45e33d7fe390effe75ec5c74f8bf (patch) | |
| tree | 84fa8be209351a95897efedad824ead658d1c9f7 /fs/coda/upcall.c | |
| parent | c65c5131b349b08f3292b1cd10239cf376bfcb15 (diff) | |
| download | kernel-crypto-5f47c7eac65a45e33d7fe390effe75ec5c74f8bf.tar.gz kernel-crypto-5f47c7eac65a45e33d7fe390effe75ec5c74f8bf.tar.xz kernel-crypto-5f47c7eac65a45e33d7fe390effe75ec5c74f8bf.zip | |
coda breakage
a) switch by loff_t == __cmpdi2 use. Replaced with a couple
of obvious ifs; update of ->f_pos in the first one makes sure that we
do the right thing in all cases.
b) block_signals() and unblock_signals() are globals on UML.
Renamed coda ones; in principle UML probably ought to do rename as
well, but that's another story.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda/upcall.c')
| -rw-r--r-- | fs/coda/upcall.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index e4e766e5557..cd561d2e90b 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c @@ -632,7 +632,7 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs) /* * coda_upcall and coda_downcall routines. */ -static void block_signals(sigset_t *old) +static void coda_block_signals(sigset_t *old) { spin_lock_irq(¤t->sighand->siglock); *old = current->blocked; @@ -646,7 +646,7 @@ static void block_signals(sigset_t *old) spin_unlock_irq(¤t->sighand->siglock); } -static void unblock_signals(sigset_t *old) +static void coda_unblock_signals(sigset_t *old) { spin_lock_irq(¤t->sighand->siglock); current->blocked = *old; @@ -672,7 +672,7 @@ static inline void coda_waitfor_upcall(struct upc_req *req) sigset_t old; int blocked; - block_signals(&old); + coda_block_signals(&old); blocked = 1; add_wait_queue(&req->uc_sleep, &wait); @@ -689,7 +689,7 @@ static inline void coda_waitfor_upcall(struct upc_req *req) if (blocked && time_after(jiffies, timeout) && CODA_INTERRUPTIBLE(req)) { - unblock_signals(&old); + coda_unblock_signals(&old); blocked = 0; } @@ -704,7 +704,7 @@ static inline void coda_waitfor_upcall(struct upc_req *req) schedule(); } if (blocked) - unblock_signals(&old); + coda_unblock_signals(&old); remove_wait_queue(&req->uc_sleep, &wait); set_current_state(TASK_RUNNING); |