diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-04-19 16:31:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-01 17:05:59 -0700 |
| commit | d0769f552d8389cb6fe23b65b71bec7d9ba6b446 (patch) | |
| tree | cdd649ad4232fce73872c9543a6f62f34f2b0e9a /fs | |
| parent | 12b1ca6601c0ff4bc4fe44f8d631cd3eeaf18c88 (diff) | |
| download | lwn-d0769f552d8389cb6fe23b65b71bec7d9ba6b446.tar.gz lwn-d0769f552d8389cb6fe23b65b71bec7d9ba6b446.zip | |
NFS: Fix an Oops in nfs_setattr()
NFS: Fix an Oops in nfs_setattr()
It looks like nfs_setattr() and nfs_rename() also need to test whether the
target is a regular file before calling nfs_wb_all()...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 3 | ||||
| -rw-r--r-- | fs/nfs/inode.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index d9ba8cb0ee75..80b4264d4ea3 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1659,7 +1659,8 @@ go_ahead: * ... prune child dentries and writebacks if needed. */ if (atomic_read(&old_dentry->d_count) > 1) { - nfs_wb_all(old_inode); + if (S_ISREG(old_inode->i_mode)) + nfs_wb_all(old_inode); shrink_dcache_parent(old_dentry); } nfs_inode_return_delegation(old_inode); diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 5a83e8d6ecb3..e8cacef4f8ec 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -334,8 +334,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) lock_kernel(); nfs_begin_data_update(inode); /* Write all dirty data */ - filemap_write_and_wait(inode->i_mapping); - nfs_wb_all(inode); + if (S_ISREG(inode->i_mode)) { + filemap_write_and_wait(inode->i_mapping); + nfs_wb_all(inode); + } /* * Return any delegations if we're going to change ACLs */ |