diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
| commit | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (patch) | |
| tree | 652a84674ed05eaa46a813de2223af0bd0168a5a /fs/ntfs/inode.c | |
| parent | 5762ba1873b0bb9faa631aaa02f533c2b9837f82 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'fs/ntfs/inode.c')
| -rw-r--r-- | fs/ntfs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index e9da092e2772..86bef156cf0a 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
| @@ -1406,9 +1406,6 @@ static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi) | |||
| 1406 | ni->allocated_size = sle64_to_cpu( | 1406 | ni->allocated_size = sle64_to_cpu( |
| 1407 | a->data.non_resident.allocated_size); | 1407 | a->data.non_resident.allocated_size); |
| 1408 | } | 1408 | } |
| 1409 | /* Setup the operations for this attribute inode. */ | ||
| 1410 | vi->i_op = NULL; | ||
| 1411 | vi->i_fop = NULL; | ||
| 1412 | if (NInoMstProtected(ni)) | 1409 | if (NInoMstProtected(ni)) |
| 1413 | vi->i_mapping->a_ops = &ntfs_mst_aops; | 1410 | vi->i_mapping->a_ops = &ntfs_mst_aops; |
| 1414 | else | 1411 | else |