diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 11:31:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 11:31:01 -0500 |
| commit | b8a7f3cd7e8212e5c572178ff3b5a514861036a5 (patch) | |
| tree | f88fd0fc83a466a6d5781f90e7ed76cb2fa0f5d7 /fs/ntfs/inode.c | |
| parent | a377d181e65241344dd95aa4a42c477477be03f1 (diff) | |
| parent | eaff8079d4f1016a12e34ab323737314f24127dd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
kill I_LOCK
fold do_sync_file_range into sys_sync_file_range
fix up O_SYNC comments
VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
fsstack/ecryptfs: remove unused get_nlinks param to fsstack_copy_attr_all
vfs: remove extraneous NULL d_inode check from do_filp_open
fs: no games with DCACHE_UNHASHED
fs: anon_inodes implement dname
dio: fix use-after-free
Diffstat (limited to 'fs/ntfs/inode.c')
| -rw-r--r-- | fs/ntfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 9938034762cc..dc2505abb6d7 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
| @@ -530,7 +530,7 @@ err_corrupt_attr: | |||
| 530 | * the ntfs inode. | 530 | * the ntfs inode. |
| 531 | * | 531 | * |
| 532 | * Q: What locks are held when the function is called? | 532 | * Q: What locks are held when the function is called? |
| 533 | * A: i_state has I_LOCK set, hence the inode is locked, also | 533 | * A: i_state has I_NEW set, hence the inode is locked, also |
| 534 | * i_count is set to 1, so it is not going to go away | 534 | * i_count is set to 1, so it is not going to go away |
| 535 | * i_flags is set to 0 and we have no business touching it. Only an ioctl() | 535 | * i_flags is set to 0 and we have no business touching it. Only an ioctl() |
| 536 | * is allowed to write to them. We should of course be honouring them but | 536 | * is allowed to write to them. We should of course be honouring them but |
| @@ -1207,7 +1207,7 @@ err_out: | |||
| 1207 | * necessary fields in @vi as well as initializing the ntfs inode. | 1207 | * necessary fields in @vi as well as initializing the ntfs inode. |
| 1208 | * | 1208 | * |
| 1209 | * Q: What locks are held when the function is called? | 1209 | * Q: What locks are held when the function is called? |
| 1210 | * A: i_state has I_LOCK set, hence the inode is locked, also | 1210 | * A: i_state has I_NEW set, hence the inode is locked, also |
| 1211 | * i_count is set to 1, so it is not going to go away | 1211 | * i_count is set to 1, so it is not going to go away |
| 1212 | * | 1212 | * |
| 1213 | * Return 0 on success and -errno on error. In the error case, the inode will | 1213 | * Return 0 on success and -errno on error. In the error case, the inode will |
| @@ -1474,7 +1474,7 @@ err_out: | |||
| 1474 | * normal directory inodes. | 1474 | * normal directory inodes. |
| 1475 | * | 1475 | * |
| 1476 | * Q: What locks are held when the function is called? | 1476 | * Q: What locks are held when the function is called? |
| 1477 | * A: i_state has I_LOCK set, hence the inode is locked, also | 1477 | * A: i_state has I_NEW set, hence the inode is locked, also |
| 1478 | * i_count is set to 1, so it is not going to go away | 1478 | * i_count is set to 1, so it is not going to go away |
| 1479 | * | 1479 | * |
| 1480 | * Return 0 on success and -errno on error. In the error case, the inode will | 1480 | * Return 0 on success and -errno on error. In the error case, the inode will |