Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 125763
b: refs/heads/master
c: acfa438
h: refs/heads/master
i:
  125761: 11d7fbc
  125759: 514de88
v: v3
  • Loading branch information
Al Viro committed Jan 5, 2009
1 parent 25e11b7 commit 66c4ce4
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9742df331deb3fce95b321f38d4ea0c4e75edb63
refs/heads/master: acfa4380efe77e290d3a96b11cd4c9f24f4fbb18
2 changes: 1 addition & 1 deletion trunk/fs/cifs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@ static int cifs_vmtruncate(struct inode *inode, loff_t offset)
i_size_write(inode, offset);
spin_unlock(&inode->i_lock);
out_truncate:
if (inode->i_op && inode->i_op->truncate)
if (inode->i_op->truncate)
inode->i_op->truncate(inode);
return 0;
out_sig:
Expand Down
3 changes: 1 addition & 2 deletions trunk/fs/ecryptfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user * buf, int bufsiz)
struct ecryptfs_crypt_stat *crypt_stat;

lower_dentry = ecryptfs_dentry_to_lower(dentry);
if (!lower_dentry->d_inode->i_op ||
!lower_dentry->d_inode->i_op->readlink) {
if (!lower_dentry->d_inode->i_op->readlink) {
rc = -EINVAL;
goto out;
}
Expand Down
32 changes: 13 additions & 19 deletions trunk/fs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ int inode_permission(struct inode *inode, int mask)
return -EACCES;
}

if (inode->i_op && inode->i_op->permission)
if (inode->i_op->permission)
retval = inode->i_op->permission(inode, mask);
else
retval = generic_permission(inode, mask, NULL);
Expand Down Expand Up @@ -432,7 +432,7 @@ static int exec_permission_lite(struct inode *inode)
{
umode_t mode = inode->i_mode;

if (inode->i_op && inode->i_op->permission)
if (inode->i_op->permission)
return -EAGAIN;

if (current_fsuid() == inode->i_uid)
Expand Down Expand Up @@ -908,9 +908,6 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
inode = next.dentry->d_inode;
if (!inode)
goto out_dput;
err = -ENOTDIR;
if (!inode->i_op)
goto out_dput;

if (inode->i_op->follow_link) {
err = do_follow_link(&next, nd);
Expand All @@ -920,9 +917,6 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
inode = nd->path.dentry->d_inode;
if (!inode)
break;
err = -ENOTDIR;
if (!inode->i_op)
break;
} else
path_to_nameidata(&next, nd);
err = -ENOTDIR;
Expand Down Expand Up @@ -961,7 +955,7 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
break;
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
&& inode && inode->i_op->follow_link) {
err = do_follow_link(&next, nd);
if (err)
goto return_err;
Expand All @@ -973,7 +967,7 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
break;
if (lookup_flags & LOOKUP_DIRECTORY) {
err = -ENOTDIR;
if (!inode->i_op || !inode->i_op->lookup)
if (!inode->i_op->lookup)
break;
}
goto return_base;
Expand Down Expand Up @@ -1469,7 +1463,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
if (error)
return error;

if (!dir->i_op || !dir->i_op->create)
if (!dir->i_op->create)
return -EACCES; /* shouldn't it be ENOSYS? */
mode &= S_IALLUGO;
mode |= S_IFREG;
Expand Down Expand Up @@ -1752,7 +1746,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
error = -ENOENT;
if (!path.dentry->d_inode)
goto exit_dput;
if (path.dentry->d_inode->i_op && path.dentry->d_inode->i_op->follow_link)
if (path.dentry->d_inode->i_op->follow_link)
goto do_link;

path_to_nameidata(&path, &nd);
Expand Down Expand Up @@ -1933,7 +1927,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD))
return -EPERM;

if (!dir->i_op || !dir->i_op->mknod)
if (!dir->i_op->mknod)
return -EPERM;

error = devcgroup_inode_mknod(mode, dev);
Expand Down Expand Up @@ -2035,7 +2029,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
if (error)
return error;

if (!dir->i_op || !dir->i_op->mkdir)
if (!dir->i_op->mkdir)
return -EPERM;

mode &= (S_IRWXUGO|S_ISVTX);
Expand Down Expand Up @@ -2126,7 +2120,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
if (error)
return error;

if (!dir->i_op || !dir->i_op->rmdir)
if (!dir->i_op->rmdir)
return -EPERM;

DQUOT_INIT(dir);
Expand Down Expand Up @@ -2213,7 +2207,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
if (error)
return error;

if (!dir->i_op || !dir->i_op->unlink)
if (!dir->i_op->unlink)
return -EPERM;

DQUOT_INIT(dir);
Expand Down Expand Up @@ -2320,7 +2314,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
if (error)
return error;

if (!dir->i_op || !dir->i_op->symlink)
if (!dir->i_op->symlink)
return -EPERM;

error = security_inode_symlink(dir, dentry, oldname);
Expand Down Expand Up @@ -2401,7 +2395,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
*/
if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
return -EPERM;
if (!dir->i_op || !dir->i_op->link)
if (!dir->i_op->link)
return -EPERM;
if (S_ISDIR(inode->i_mode))
return -EPERM;
Expand Down Expand Up @@ -2608,7 +2602,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (error)
return error;

if (!old_dir->i_op || !old_dir->i_op->rename)
if (!old_dir->i_op->rename)
return -EPERM;

DQUOT_INIT(old_dir);
Expand Down
8 changes: 4 additions & 4 deletions trunk/fs/nfsd/vfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
dirp = dentry->d_inode;

err = nfserr_notdir;
if(!dirp->i_op || !dirp->i_op->lookup)
if (!dirp->i_op->lookup)
goto out;
/*
* Check whether the response file handle has been verified yet.
Expand Down Expand Up @@ -1347,7 +1347,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
/* Get all the sanity checks out of the way before
* we lock the parent. */
err = nfserr_notdir;
if(!dirp->i_op || !dirp->i_op->lookup)
if (!dirp->i_op->lookup)
goto out;
fh_lock_nested(fhp, I_MUTEX_PARENT);

Expand Down Expand Up @@ -1482,7 +1482,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
inode = dentry->d_inode;

err = nfserr_inval;
if (!inode->i_op || !inode->i_op->readlink)
if (!inode->i_op->readlink)
goto out;

touch_atime(fhp->fh_export->ex_path.mnt, dentry);
Expand Down Expand Up @@ -2162,7 +2162,7 @@ nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl)
size_t size;
int error;

if (!IS_POSIXACL(inode) || !inode->i_op ||
if (!IS_POSIXACL(inode) ||
!inode->i_op->setxattr || !inode->i_op->removexattr)
return -EOPNOTSUPP;
switch(type) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/open.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len)
if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0))
goto out_fput;

if (inode->i_op && inode->i_op->fallocate)
if (inode->i_op->fallocate)
ret = inode->i_op->fallocate(inode, mode, offset, len);
else
ret = -EOPNOTSUPP;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/stat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ asmlinkage long sys_readlinkat(int dfd, const char __user *pathname,
struct inode *inode = path.dentry->d_inode;

error = -EINVAL;
if (inode->i_op && inode->i_op->readlink) {
if (inode->i_op->readlink) {
error = security_inode_readlink(path.dentry);
if (!error) {
touch_atime(path.mnt, path.dentry);
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ vfs_listxattr(struct dentry *d, char *list, size_t size)
if (error)
return error;
error = -EOPNOTSUPP;
if (d->d_inode->i_op && d->d_inode->i_op->listxattr) {
if (d->d_inode->i_op->listxattr) {
error = d->d_inode->i_op->listxattr(d, list, size);
} else {
error = security_inode_listsecurity(d->d_inode, list, size);
Expand Down
4 changes: 2 additions & 2 deletions trunk/mm/memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2266,7 +2266,7 @@ int vmtruncate(struct inode * inode, loff_t offset)
unmap_mapping_range(mapping, offset + PAGE_SIZE - 1, 0, 1);
}

if (inode->i_op && inode->i_op->truncate)
if (inode->i_op->truncate)
inode->i_op->truncate(inode);
return 0;

Expand All @@ -2286,7 +2286,7 @@ int vmtruncate_range(struct inode *inode, loff_t offset, loff_t end)
* a way to truncate a range of blocks (punch a hole) -
* we should return failure right now.
*/
if (!inode->i_op || !inode->i_op->truncate_range)
if (!inode->i_op->truncate_range)
return -ENOSYS;

mutex_lock(&inode->i_mutex);
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/nommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int vmtruncate(struct inode *inode, loff_t offset)
i_size_write(inode, offset);

out_truncate:
if (inode->i_op && inode->i_op->truncate)
if (inode->i_op->truncate)
inode->i_op->truncate(inode);
return 0;
out_sig:
Expand Down
6 changes: 3 additions & 3 deletions trunk/security/commoncap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ int cap_inode_need_killpriv(struct dentry *dentry)
struct inode *inode = dentry->d_inode;
int error;

if (!inode->i_op || !inode->i_op->getxattr)
if (!inode->i_op->getxattr)
return 0;

error = inode->i_op->getxattr(dentry, XATTR_NAME_CAPS, NULL, 0);
Expand All @@ -259,7 +259,7 @@ int cap_inode_killpriv(struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;

if (!inode->i_op || !inode->i_op->removexattr)
if (!inode->i_op->removexattr)
return 0;

return inode->i_op->removexattr(dentry, XATTR_NAME_CAPS);
Expand Down Expand Up @@ -317,7 +317,7 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data

memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));

if (!inode || !inode->i_op || !inode->i_op->getxattr)
if (!inode || !inode->i_op->getxattr)
return -ENODATA;

size = inode->i_op->getxattr((struct dentry *)dentry, XATTR_NAME_CAPS, &caps,
Expand Down

0 comments on commit 66c4ce4

Please sign in to comment.