From a918d9998cbba34268e62174ea59801fe8260af1 Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Sat, 15 Dec 2012 11:59:20 +0100 Subject: [PATCH] --- yaml --- r: 347810 b: refs/heads/master c: d30357f2f0ec0bfb67fd39f8f76d22d02d78631e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/libfs.c | 2 -- trunk/include/linux/fs.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1396437d1c31..d6d98cc0b995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9014da7525dffef69131f717decf262e08ff3d58 +refs/heads/master: d30357f2f0ec0bfb67fd39f8f76d22d02d78631e diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c index 35fc6e74cd88..916da8c4158b 100644 --- a/trunk/fs/libfs.c +++ b/trunk/fs/libfs.c @@ -369,8 +369,6 @@ int simple_setattr(struct dentry *dentry, struct iattr *iattr) struct inode *inode = dentry->d_inode; int error; - WARN_ON_ONCE(inode->i_op->truncate); - error = inode_change_ok(inode, iattr); if (error) return error; diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index a823d4be38e7..a0c5ba57ffc5 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1565,7 +1565,6 @@ struct inode_operations { int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t); int (*rename) (struct inode *, struct dentry *, struct inode *, struct dentry *); - void (*truncate) (struct inode *); int (*setattr) (struct dentry *, struct iattr *); int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *); int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);