diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
| commit | bd0f725c4c0bd77b6d931f63eda2d51423a22d43 (patch) | |
| tree | 95caf3ce41ef7d73eae1972ad04b230cdeed6340 /fs/nfs/internal.h | |
| parent | 2ca310fc4160ed0420da65534a21ae77b24326a8 (diff) | |
| parent | fdb63dcdb53a3c6dc11d4e438ef2425ec962d1e9 (diff) | |
| download | linux-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.tar.gz linux-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.tar.bz2 linux-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.zip | |
Merge branch 'devel' into linux-next
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index b46cf5a67329..dd8bfc2e2464 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -301,6 +301,7 @@ extern struct nfs_client *nfs_init_client(struct nfs_client *clp, const char *ip_addr); /* dir.c */ +extern void nfs_force_use_readdirplus(struct inode *dir); extern unsigned long nfs_access_cache_count(struct shrinker *shrink, struct shrink_control *sc); extern unsigned long nfs_access_cache_scan(struct shrinker *shrink, @@ -474,6 +475,13 @@ extern int nfs_migrate_page(struct address_space *, #define nfs_migrate_page NULL #endif +/* unlink.c */ +extern struct rpc_task * +nfs_async_rename(struct inode *old_dir, struct inode *new_dir, + struct dentry *old_dentry, struct dentry *new_dentry, + void (*complete)(struct rpc_task *, struct nfs_renamedata *)); +extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry); + /* direct.c */ void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, struct nfs_direct_req *dreq); |