diff options
author | Dave Hansen <haveblue@us.ibm.com> | 2006-10-01 02:29:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:30 -0400 |
commit | d8c76e6f45c111c32a4b3e50a2adc9210737b0d8 (patch) | |
tree | 25521b59d48c6d8c9aec1af54dbe5008ad4b215b /security | |
parent | 9a53c3a783c2fa9b969628e65695c11c3e51e673 (diff) |
[PATCH] r/o bind mount prepwork: inc_nlink() helper
This is mostly included for parity with dec_nlink(), where we will have some
more hooks. This one should stay pretty darn straightforward for now.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/inode.c | 4 | ||||
-rw-r--r-- | security/selinux/selinuxfs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/inode.c b/security/inode.c index 49ee51529396..9b16e14f3a80 100644 --- a/security/inode.c +++ b/security/inode.c | |||
@@ -78,7 +78,7 @@ static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev) | |||
78 | inode->i_fop = &simple_dir_operations; | 78 | inode->i_fop = &simple_dir_operations; |
79 | 79 | ||
80 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ | 80 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ |
81 | inode->i_nlink++; | 81 | inc_nlink(inode); |
82 | break; | 82 | break; |
83 | } | 83 | } |
84 | } | 84 | } |
@@ -111,7 +111,7 @@ static int mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
111 | mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR; | 111 | mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR; |
112 | res = mknod(dir, dentry, mode, 0); | 112 | res = mknod(dir, dentry, mode, 0); |
113 | if (!res) | 113 | if (!res) |
114 | dir->i_nlink++; | 114 | inc_nlink(dir); |
115 | return res; | 115 | return res; |
116 | } | 116 | } |
117 | 117 | ||
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index bab7b386cb8d..cd244419c980 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -1253,10 +1253,10 @@ static int sel_make_dir(struct inode *dir, struct dentry *dentry) | |||
1253 | inode->i_op = &simple_dir_inode_operations; | 1253 | inode->i_op = &simple_dir_inode_operations; |
1254 | inode->i_fop = &simple_dir_operations; | 1254 | inode->i_fop = &simple_dir_operations; |
1255 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ | 1255 | /* directory inodes start off with i_nlink == 2 (for "." entry) */ |
1256 | inode->i_nlink++; | 1256 | inc_nlink(inode); |
1257 | d_add(dentry, inode); | 1257 | d_add(dentry, inode); |
1258 | /* bump link count on parent directory, too */ | 1258 | /* bump link count on parent directory, too */ |
1259 | dir->i_nlink++; | 1259 | inc_nlink(dir); |
1260 | out: | 1260 | out: |
1261 | return ret; | 1261 | return ret; |
1262 | } | 1262 | } |