diff options
Diffstat (limited to 'fs/lockd/svclock.c')
-rw-r--r-- | fs/lockd/svclock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 814c6064c9e0..7e219b938552 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
@@ -334,13 +334,13 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) | |||
334 | * Attempt to establish a lock, and if it can't be granted, block it | 334 | * Attempt to establish a lock, and if it can't be granted, block it |
335 | * if required. | 335 | * if required. |
336 | */ | 336 | */ |
337 | u32 | 337 | __be32 |
338 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | 338 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, |
339 | struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) | 339 | struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) |
340 | { | 340 | { |
341 | struct nlm_block *block, *newblock = NULL; | 341 | struct nlm_block *block, *newblock = NULL; |
342 | int error; | 342 | int error; |
343 | u32 ret; | 343 | __be32 ret; |
344 | 344 | ||
345 | dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", | 345 | dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", |
346 | file->f_file->f_dentry->d_inode->i_sb->s_id, | 346 | file->f_file->f_dentry->d_inode->i_sb->s_id, |
@@ -415,7 +415,7 @@ out: | |||
415 | /* | 415 | /* |
416 | * Test for presence of a conflicting lock. | 416 | * Test for presence of a conflicting lock. |
417 | */ | 417 | */ |
418 | u32 | 418 | __be32 |
419 | nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, | 419 | nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, |
420 | struct nlm_lock *conflock) | 420 | struct nlm_lock *conflock) |
421 | { | 421 | { |
@@ -448,7 +448,7 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, | |||
448 | * afterwards. In this case the block will still be there, and hence | 448 | * afterwards. In this case the block will still be there, and hence |
449 | * must be removed. | 449 | * must be removed. |
450 | */ | 450 | */ |
451 | u32 | 451 | __be32 |
452 | nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) | 452 | nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) |
453 | { | 453 | { |
454 | int error; | 454 | int error; |
@@ -476,7 +476,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) | |||
476 | * be in progress. | 476 | * be in progress. |
477 | * The calling procedure must check whether the file can be closed. | 477 | * The calling procedure must check whether the file can be closed. |
478 | */ | 478 | */ |
479 | u32 | 479 | __be32 |
480 | nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) | 480 | nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) |
481 | { | 481 | { |
482 | struct nlm_block *block; | 482 | struct nlm_block *block; |