Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 87ec21741138bb42e7f943bb142b1d8567c10925

Authored by Steven Whitehouse
1 parent 536baf02f6
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

GFS2: Move gfs2_unlink_ok into ops_inode.c 

Another function which is only called from one ops_inode.c so
we move it and make it static.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 3 changed files with 38 additions and 41 deletions Side-by-side Diff

... ... @@ -1046,45 +1046,6 @@
1046 1046 return ERR_PTR(error);
1047 1047 }
1048 1048  
1049   -
1050   -/*
1051   - * gfs2_unlink_ok - check to see that a inode is still in a directory
1052   - * @dip: the directory
1053   - * @name: the name of the file
1054   - * @ip: the inode
1055   - *
1056   - * Assumes that the lock on (at least) @dip is held.
1057   - *
1058   - * Returns: 0 if the parent/child relationship is correct, errno if it isn't
1059   - */
1060   -
1061   -int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
1062   - const struct gfs2_inode *ip)
1063   -{
1064   - int error;
1065   -
1066   - if (IS_IMMUTABLE(&ip->i_inode) || IS_APPEND(&ip->i_inode))
1067   - return -EPERM;
1068   -
1069   - if ((dip->i_inode.i_mode & S_ISVTX) &&
1070   - dip->i_inode.i_uid != current_fsuid() &&
1071   - ip->i_inode.i_uid != current_fsuid() && !capable(CAP_FOWNER))
1072   - return -EPERM;
1073   -
1074   - if (IS_APPEND(&dip->i_inode))
1075   - return -EPERM;
1076   -
1077   - error = gfs2_permission(&dip->i_inode, MAY_WRITE | MAY_EXEC);
1078   - if (error)
1079   - return error;
1080   -
1081   - error = gfs2_dir_check(&dip->i_inode, name, ip);
1082   - if (error)
1083   - return error;
1084   -
1085   - return 0;
1086   -}
1087   -
1088 1049 static int __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)
1089 1050 {
1090 1051 struct buffer_head *dibh;
... ... @@ -96,8 +96,6 @@
96 96 extern struct inode *gfs2_createi(struct gfs2_holder *ghs,
97 97 const struct qstr *name,
98 98 unsigned int mode, dev_t dev);
99   -extern int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
100   - const struct gfs2_inode *ip);
101 99 extern int gfs2_permission(struct inode *inode, int mask);
102 100 extern int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr);
103 101 extern struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);
... ... @@ -262,6 +262,44 @@
262 262 return error;
263 263 }
264 264  
  265 +/*
  266 + * gfs2_unlink_ok - check to see that a inode is still in a directory
  267 + * @dip: the directory
  268 + * @name: the name of the file
  269 + * @ip: the inode
  270 + *
  271 + * Assumes that the lock on (at least) @dip is held.
  272 + *
  273 + * Returns: 0 if the parent/child relationship is correct, errno if it isn't
  274 + */
  275 +
  276 +static int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,
  277 + const struct gfs2_inode *ip)
  278 +{
  279 + int error;
  280 +
  281 + if (IS_IMMUTABLE(&ip->i_inode) || IS_APPEND(&ip->i_inode))
  282 + return -EPERM;
  283 +
  284 + if ((dip->i_inode.i_mode & S_ISVTX) &&
  285 + dip->i_inode.i_uid != current_fsuid() &&
  286 + ip->i_inode.i_uid != current_fsuid() && !capable(CAP_FOWNER))
  287 + return -EPERM;
  288 +
  289 + if (IS_APPEND(&dip->i_inode))
  290 + return -EPERM;
  291 +
  292 + error = gfs2_permission(&dip->i_inode, MAY_WRITE | MAY_EXEC);
  293 + if (error)
  294 + return error;
  295 +
  296 + error = gfs2_dir_check(&dip->i_inode, name, ip);
  297 + if (error)
  298 + return error;
  299 +
  300 + return 0;
  301 +}
  302 +
265 303 /**
266 304 * gfs2_unlink - Unlink a file
267 305 * @dir: The inode of the directory containing the file to unlink