diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 14:41:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 14:41:01 -0400 |
| commit | d211858837ff8d8e31942ca7d27e6e08b3b46f5e (patch) | |
| tree | a8ec83a791066e64ad02052498dbe39ebefacab9 | |
| parent | f1f8935a5c38a2c61e86a42bc971a2539eef2211 (diff) | |
| parent | f0023bc617ba600956b9226f1806033d7486c8ba (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
vfs: add d_prune dentry operation
vfs: protect i_nlink
filesystems: add set_nlink()
filesystems: add missing nlink wrappers
logfs: remove unnecessary nlink setting
ocfs2: remove unnecessary nlink setting
jfs: remove unnecessary nlink setting
hypfs: remove unnecessary nlink setting
vfs: ignore error on forced remount
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
vfs: fix dentry leak in simple_fill_super()
108 files changed, 301 insertions, 235 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 653380793a6c..d819ba16a0c7 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -29,6 +29,7 @@ d_hash no no no maybe | |||
| 29 | d_compare: yes no no maybe | 29 | d_compare: yes no no maybe |
| 30 | d_delete: no yes no no | 30 | d_delete: no yes no no |
| 31 | d_release: no no yes no | 31 | d_release: no no yes no |
| 32 | d_prune: no yes no no | ||
| 32 | d_iput: no no yes no | 33 | d_iput: no no yes no |
| 33 | d_dname: no no no no | 34 | d_dname: no no no no |
| 34 | d_automount: no no yes no | 35 | d_automount: no no yes no |
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index 6fe874fc5f8e..481f4f76f664 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
| @@ -108,9 +108,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
| 108 | ret->i_gid = hypfs_info->gid; | 108 | ret->i_gid = hypfs_info->gid; |
| 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 110 | if (mode & S_IFDIR) | 110 | if (mode & S_IFDIR) |
| 111 | ret->i_nlink = 2; | 111 | set_nlink(ret, 2); |
| 112 | else | ||
| 113 | ret->i_nlink = 1; | ||
| 114 | } | 112 | } |
| 115 | return ret; | 113 | return ret; |
| 116 | } | 114 | } |
| @@ -361,7 +359,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, | |||