diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-09-29 17:48:19 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 17:19:53 -0400 |
commit | 60ccd4ec4170c9487e3792322626acd160197bce (patch) | |
tree | b35353518bd7945a40e39edfa543ce80aaa3f8b4 /fs/nfs/inode.c | |
parent | 80eb209def76d375677840800eb838abce1e6639 (diff) |
NFS: Remove nfs_begin_data_update/nfs_end_data_update
The lower level routines in fs/nfs/proc.c, fs/nfs/nfs3proc.c and
fs/nfs/nfs4proc.c should already be dealing with the revalidation issues.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r-- | fs/nfs/inode.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 1d507a2a96d6..1c23d3a67c85 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -344,7 +344,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
344 | return 0; | 344 | return 0; |
345 | 345 | ||
346 | lock_kernel(); | 346 | lock_kernel(); |
347 | nfs_begin_data_update(inode); | ||
348 | /* Write all dirty data */ | 347 | /* Write all dirty data */ |
349 | if (S_ISREG(inode->i_mode)) { | 348 | if (S_ISREG(inode->i_mode)) { |
350 | filemap_write_and_wait(inode->i_mapping); | 349 | filemap_write_and_wait(inode->i_mapping); |
@@ -358,7 +357,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
358 | error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr); | 357 | error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr); |
359 | if (error == 0) | 358 | if (error == 0) |
360 | nfs_refresh_inode(inode, &fattr); | 359 | nfs_refresh_inode(inode, &fattr); |
361 | nfs_end_data_update(inode); | ||
362 | unlock_kernel(); | 360 | unlock_kernel(); |
363 | return error; | 361 | return error; |
364 | } | 362 | } |
@@ -755,23 +753,6 @@ out: | |||
755 | return ret; | 753 | return ret; |
756 | } | 754 | } |
757 | 755 | ||
758 | /** | ||
759 | * nfs_end_data_update | ||
760 | * @inode - pointer to inode | ||
761 | * Declare end of the operations that will update file data | ||
762 | * This will mark the inode as immediately needing revalidation | ||
763 | * of its attribute cache. | ||
764 | */ | ||
765 | void nfs_end_data_update(struct inode *inode) | ||
766 | { | ||
767 | /* Directories: invalidate page cache */ | ||
768 | if (S_ISDIR(inode->i_mode)) { | ||
769 | spin_lock(&inode->i_lock); | ||
770 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; | ||
771 | spin_unlock(&inode->i_lock); | ||
772 | } | ||
773 | } | ||
774 | |||
775 | static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) | 756 | static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) |
776 | { | 757 | { |
777 | struct nfs_inode *nfsi = NFS_I(inode); | 758 | struct nfs_inode *nfsi = NFS_I(inode); |