diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /fs | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
| download | op-kernel-dev-5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a.zip op-kernel-dev-5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a.tar.gz | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/super.c | 1 | ||||
| -rw-r--r-- | fs/afs/write.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index 579af63..370cecc 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c @@ -47,7 +47,6 @@ struct file_system_type afs_fs_type = { static const struct super_operations afs_super_ops = { .statfs = afs_statfs, .alloc_inode = afs_alloc_inode, - .drop_inode = generic_delete_inode, .write_inode = afs_write_inode, .destroy_inode = afs_destroy_inode, .clear_inode = afs_clear_inode, diff --git a/fs/afs/write.c b/fs/afs/write.c index 28f3751..a03b92a 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -206,7 +206,6 @@ int afs_prepare_write(struct file *file, struct page *page, _leave(" = %d [prep]", ret); return ret; } - SetPageUptodate(page); } try_again: @@ -311,8 +310,8 @@ int afs_commit_write(struct file *file, struct page *page, spin_unlock(&vnode->writeback_lock); } + SetPageUptodate(page); set_page_dirty(page); - if (PageDirty(page)) _debug("dirtied"); |
