projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
[linux-2.6-microblaze.git]
/
fs
/
nfs
/
inode.c
diff --git
a/fs/nfs/inode.c
b/fs/nfs/inode.c
index
e5fcc1f
..
38b93d5
100644
(file)
--- a/
fs/nfs/inode.c
+++ b/
fs/nfs/inode.c
@@
-85,9
+85,9
@@
int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)
}
EXPORT_SYMBOL_GPL(nfs_wait_bit_killable);
-int nfs_wait_atomic_killable(atomic_t *p)
+int nfs_wait_atomic_killable(atomic_t *p
, unsigned int mode
)
{
- return nfs_wait_killable(
TASK_KILLABLE
);
+ return nfs_wait_killable(
mode
);
}
/**