diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 13:06:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 13:06:51 -0400 |
| commit | 10effcb548c170d59ea1d2152f2ee0ad45ce4c9d (patch) | |
| tree | 6a1bf04ed66a1dcd242e8b2bd0c86690194cc09f /fs/inode.c | |
| parent | c3ca48f062a37c2f79560a9b0b9f1b08039aa248 (diff) | |
| parent | 0f60f240d522772467c7d2cebedb910748c78ed4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
FS: lookup_mnt() is only used in the core fs routines now
bfs: fix bitmap size argument to find_first_zero_bit()
fs: Use BUG_ON(!mnt) at dentry_open().
fs: devpts_pty_new() return -ENOMEM if dentry allocation failed
nfs: lock() vs unlock() typo
pstore: fix leaking ->i_private
introduce sys_syncfs to sync a single file system
Small typo fix...
Filesystem: fifo: Fixed coding style issue.
fs/inode: Fix kernel-doc format for inode_init_owner
select: remove unused MAX_SELECT_SECONDS
vfs: cleanup do_vfs_ioctl()
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 9910c039f026..16fefd373fc2 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -1715,7 +1715,7 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev) | |||
| 1715 | EXPORT_SYMBOL(init_special_inode); | 1715 | EXPORT_SYMBOL(init_special_inode); |
| 1716 | 1716 | ||
| 1717 | /** | 1717 | /** |
| 1718 | * Init uid,gid,mode for new inode according to posix standards | 1718 | * inode_init_owner - Init uid,gid,mode for new inode according to posix standards |
| 1719 | * @inode: New inode | 1719 | * @inode: New inode |
| 1720 | * @dir: Directory inode | 1720 | * @dir: Directory inode |
| 1721 | * @mode: mode of the new inode | 1721 | * @mode: mode of the new inode |