diff options
author | 2008-07-15 18:34:16 -0400 | |
---|---|---|
committer | 2008-07-15 18:34:16 -0400 | |
commit | e89e896d31b11a51a54ddcd3f72a76bd286dd86c (patch) | |
tree | 105a9a93a4021caeeba76e479778ad2dd2b87b57 /fs/nfs/internal.h | |
parent | Don't crash on IOMMU overflow in A100U2W driver (diff) | |
parent | nfs: set correct fl_len in nlmclnt_test() (diff) | |
download | linux-dev-e89e896d31b11a51a54ddcd3f72a76bd286dd86c.tar.xz linux-dev-e89e896d31b11a51a54ddcd3f72a76bd286dd86c.zip |
Merge branch 'devel' into next
Conflicts:
fs/nfs/file.c
Fix up the conflict with Jon Corbet's bkl-removal tree
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r-- | fs/nfs/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 04ae867dddba..24241fcbb98d 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -150,6 +150,7 @@ extern void nfs_clear_inode(struct inode *); #ifdef CONFIG_NFS_V4 extern void nfs4_clear_inode(struct inode *); #endif +void nfs_zap_acl_cache(struct inode *inode); /* super.c */ extern struct file_system_type nfs_xdev_fs_type; |