diff --git a/[refs] b/[refs] index 64cefaaf0af7..61d4daf12ef3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76fe3276be26cff2e609cdcfbc1265cf1dd72b2c +refs/heads/master: 729cdb3a1ee03a4363f9c7e66ddd979727e99e1f diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 1fdefe3995fd..8494aac189f0 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1573,8 +1573,6 @@ struct file_operations { loff_t len); }; -#define IPERM_FLAG_RCU 0x0001 - struct inode_operations { struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *); void * (*follow_link) (struct dentry *, struct nameidata *);