diff --git a/[refs] b/[refs] index 3aa47221a9ec..967c79642b44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5dbac87b4343d98ae509fb787efb77f8ddc484b +refs/heads/master: 087ee8d5bec1aa6d0a1dfe3067c7298375462ceb diff --git a/trunk/fs/dquot.c b/trunk/fs/dquot.c index 2809768d9c41..686ab63a7c6c 100644 --- a/trunk/fs/dquot.c +++ b/trunk/fs/dquot.c @@ -965,7 +965,7 @@ static void send_warning(const struct dquot *dquot, const char warntype) } #endif -static inline void flush_warnings(struct dquot **dquots, char *warntype) +static inline void flush_warnings(struct dquot * const *dquots, char *warntype) { int i; @@ -1216,7 +1216,7 @@ int dquot_alloc_inode(const struct inode *inode, unsigned long number) for (cnt = 0; cnt < MAXQUOTAS; cnt++) if (inode->i_dquot[cnt]) mark_dquot_dirty(inode->i_dquot[cnt]); - flush_warnings((struct dquot **)inode->i_dquot, warntype); + flush_warnings(inode->i_dquot, warntype); up_read(&sb_dqopt(inode->i_sb)->dqptr_sem); return ret; }