aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/ops_inode.c')
-rw-r--r--fs/gfs2/ops_inode.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 9fb9490eb67a..9971a30eb78e 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -56,8 +56,6 @@ static int gfs2_create(struct inode *dir, struct dentry *dentry,
56 int new = 1; 56 int new = 1;
57 int error; 57 int error;
58 58
59 atomic_inc(&sdp->sd_ops_inode);
60
61 gfs2_holder_init(dip->i_gl, 0, 0, ghs); 59 gfs2_holder_init(dip->i_gl, 0, 0, ghs);
62 60
63 for (;;) { 61 for (;;) {
@@ -113,8 +111,6 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
113 struct inode *inode = NULL; 111 struct inode *inode = NULL;
114 int error; 112 int error;
115 113
116 atomic_inc(&sdp->sd_ops_inode);
117
118 if (!sdp->sd_args.ar_localcaching) 114 if (!sdp->sd_args.ar_localcaching)
119 dentry->d_op = &gfs2_dops; 115 dentry->d_op = &gfs2_dops;
120 116
@@ -152,8 +148,6 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
152 int alloc_required; 148 int alloc_required;
153 int error; 149 int error;
154 150
155 atomic_inc(&sdp->sd_ops_inode);
156
157 if (S_ISDIR(ip->i_di.di_mode)) 151 if (S_ISDIR(ip->i_di.di_mode))
158 return -EPERM; 152 return -EPERM;
159 153
@@ -287,8 +281,6 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
287 struct gfs2_holder ghs[2]; 281 struct gfs2_holder ghs[2];
288 int error; 282 int error;
289 283
290 atomic_inc(&sdp->sd_ops_inode);
291
292 error = gfs2_unlinked_get(sdp, &ul); 284 error = gfs2_unlinked_get(sdp, &ul);
293 if (error) 285 if (error)
294 return error; 286 return error;
@@ -345,8 +337,6 @@ static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
345 int size; 337 int size;
346 int error; 338 int error;
347 339
348 atomic_inc(&sdp->sd_ops_inode);
349
350 /* Must be stuffed with a null terminator for gfs2_follow_link() */ 340 /* Must be stuffed with a null terminator for gfs2_follow_link() */
351 size = strlen(symname); 341 size = strlen(symname);
352 if (size > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode) - 1) 342 if (size > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode) - 1)
@@ -405,8 +395,6 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
405 struct buffer_head *dibh; 395 struct buffer_head *dibh;
406 int error; 396 int error;
407 397
408 atomic_inc(&sdp->sd_ops_inode);
409
410 gfs2_holder_init(dip->i_gl, 0, 0, ghs); 398 gfs2_holder_init(dip->i_gl, 0, 0, ghs);
411 399
412 inode = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode); 400 inode = gfs2_createi(ghs, &dentry->d_name, S_IFDIR | mode);
@@ -487,8 +475,6 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
487 struct gfs2_holder ghs[2]; 475 struct gfs2_holder ghs[2];
488 int error; 476 int error;
489 477
490 atomic_inc(&sdp->sd_ops_inode);
491
492 error = gfs2_unlinked_get(sdp, &ul); 478 error = gfs2_unlinked_get(sdp, &ul);
493 if (error) 479 if (error)
494 return error; 480 return error;
@@ -556,8 +542,6 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
556 uint32_t major = 0, minor = 0; 542 uint32_t major = 0, minor = 0;
557 int error; 543 int error;
558 544
559 atomic_inc(&sdp->sd_ops_inode);
560
561 switch (mode & S_IFMT) { 545 switch (mode & S_IFMT) {
562 case S_IFBLK: 546 case S_IFBLK:
563 case S_IFCHR: 547 case S_IFCHR:
@@ -631,8 +615,6 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
631 unsigned int x; 615 unsigned int x;
632 int error; 616 int error;
633 617
634 atomic_inc(&sdp->sd_ops_inode);
635
636 if (ndentry->d_inode) { 618 if (ndentry->d_inode) {
637 nip = get_v2ip(ndentry->d_inode); 619 nip = get_v2ip(ndentry->d_inode);
638 if (ip == nip) 620 if (ip == nip)
@@ -871,8 +853,6 @@ static int gfs2_readlink(struct dentry *dentry, char __user *user_buf,
871 unsigned int len = GFS2_FAST_NAME_SIZE; 853 unsigned int len = GFS2_FAST_NAME_SIZE;
872 int error; 854 int error;
873 855
874 atomic_inc(&ip->i_sbd->sd_ops_inode);
875
876 error = gfs2_readlinki(ip, &buf, &len); 856 error = gfs2_readlinki(ip, &buf, &len);
877 if (error) 857 if (error)
878 return error; 858 return error;
@@ -909,8 +889,6 @@ static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd)
909 unsigned int len = GFS2_FAST_NAME_SIZE; 889 unsigned int len = GFS2_FAST_NAME_SIZE;
910 int error; 890 int error;
911 891
912 atomic_inc(&ip->i_sbd->sd_ops_inode);
913
914 error = gfs2_readlinki(ip, &buf, &len); 892 error = gfs2_readlinki(ip, &buf, &len);
915 if (!error) { 893 if (!error) {
916 error = vfs_follow_link(nd, buf); 894 error = vfs_follow_link(nd, buf);
@@ -936,8 +914,6 @@ static int gfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
936 struct gfs2_holder i_gh; 914 struct gfs2_holder i_gh;
937 int error; 915 int error;
938 916
939 atomic_inc(&ip->i_sbd->sd_ops_inode);
940
941 if (ip->i_vn == ip->i_gl->gl_vn) 917 if (ip->i_vn == ip->i_gl->gl_vn)
942 return generic_permission(inode, mask, gfs2_check_acl); 918 return generic_permission(inode, mask, gfs2_check_acl);
943 919
@@ -1053,8 +1029,6 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
1053 struct gfs2_holder i_gh; 1029 struct gfs2_holder i_gh;
1054 int error; 1030 int error;
1055 1031
1056 atomic_inc(&ip->i_sbd->sd_ops_inode);
1057
1058 error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh); 1032 error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
1059 if (error) 1033 if (error)
1060 return error; 1034 return error;
@@ -1102,8 +1076,6 @@ static int gfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
1102 struct gfs2_holder gh; 1076 struct gfs2_holder gh;
1103 int error; 1077 int error;
1104 1078
1105 atomic_inc(&ip->i_sbd->sd_ops_inode);
1106
1107 error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh); 1079 error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);
1108 if (!error) { 1080 if (!error) {
1109 generic_fillattr(inode, stat); 1081 generic_fillattr(inode, stat);
@@ -1119,8 +1091,6 @@ static int gfs2_setxattr(struct dentry *dentry, const char *name,
1119 struct gfs2_inode *ip = get_v2ip(dentry->d_inode); 1091 struct gfs2_inode *ip = get_v2ip(dentry->d_inode);
1120 struct gfs2_ea_request er; 1092 struct gfs2_ea_request er;
1121 1093
1122 atomic_inc(&ip->i_sbd->sd_ops_inode);
1123
1124 memset(&er, 0, sizeof(struct gfs2_ea_request)); 1094 memset(&er, 0, sizeof(struct gfs2_ea_request));
1125 er.er_type = gfs2_ea_name2type(name, &er.er_name); 1095 er.er_type = gfs2_ea_name2type(name, &er.er_name);
1126 if (er.er_type == GFS2_EATYPE_UNUSED) 1096 if (er.er_type == GFS2_EATYPE_UNUSED)
@@ -1140,8 +1110,6 @@ static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name,
1140{ 1110{
1141 struct gfs2_ea_request er; 1111 struct gfs2_ea_request er;
1142 1112
1143 atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
1144
1145 memset(&er, 0, sizeof(struct gfs2_ea_request)); 1113 memset(&er, 0, sizeof(struct gfs2_ea_request));
1146 er.er_type = gfs2_ea_name2type(name, &er.er_name); 1114 er.er_type = gfs2_ea_name2type(name, &er.er_name);
1147 if (er.er_type == GFS2_EATYPE_UNUSED) 1115 if (er.er_type == GFS2_EATYPE_UNUSED)
@@ -1157,8 +1125,6 @@ static ssize_t gfs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
1157{ 1125{
1158 struct gfs2_ea_request er; 1126 struct gfs2_ea_request er;
1159 1127
1160 atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
1161
1162 memset(&er, 0, sizeof(struct gfs2_ea_request)); 1128 memset(&er, 0, sizeof(struct gfs2_ea_request));
1163 er.er_data = (size) ? buffer : NULL; 1129 er.er_data = (size) ? buffer : NULL;
1164 er.er_data_len = size; 1130 er.er_data_len = size;
@@ -1170,8 +1136,6 @@ static int gfs2_removexattr(struct dentry *dentry, const char *name)
1170{ 1136{
1171 struct gfs2_ea_request er; 1137 struct gfs2_ea_request er;
1172 1138
1173 atomic_inc(&get_v2sdp(dentry->d_inode->i_sb)->sd_ops_inode);
1174
1175 memset(&er, 0, sizeof(struct gfs2_ea_request)); 1139 memset(&er, 0, sizeof(struct gfs2_ea_request));
1176 er.er_type = gfs2_ea_name2type(name, &er.er_name); 1140 er.er_type = gfs2_ea_name2type(name, &er.er_name);
1177 if (er.er_type == GFS2_EATYPE_UNUSED) 1141 if (er.er_type == GFS2_EATYPE_UNUSED)