diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 20:22:14 +0100 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 20:22:14 +0100 |
| commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
| tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /fs/nfs/internal.h | |
| parent | Orangefs: add verification to decode_dirents (diff) | |
| parent | Linux 4.4 (diff) | |
| download | linux-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.xz linux-5e1f3938f9e4ef539031d639879cb1cea870fab5.zip | |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 56cfde26fb9c..9dea85f7f918 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -379,7 +379,7 @@ extern int nfs_drop_inode(struct inode *); extern void nfs_clear_inode(struct inode *); extern void nfs_evict_inode(struct inode *); void nfs_zap_acl_cache(struct inode *inode); -extern int nfs_wait_bit_killable(struct wait_bit_key *key); +extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode); /* super.c */ extern const struct super_operations nfs_sops; |